Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

 smartor/src/main/java/com/smartor/domain/ServiceTask.java

@@ -256,6 +256,12 @@
    private String orgid;

    /**
     * 院区ID
     */
    @ApiModelProperty(value = "院区ID")
    private String campusid;

    /**
     * 父ID
     */
    @Excel(name = " 父ID ")