Merge remote-tracking branch 'origin/master'

陈昶聿

2 天以前 9aca6b6a72ebaa209f83778ee1e6d746fd54522f

 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 ")