Merge remote-tracking branch 'origin/master'

陈昶聿

4 天以前 8107dedd85ceec29491293d8ebf69f7d7213aa6b

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

@@ -258,6 +258,7 @@
    /**
     * 院区ID
     */
    @Excel(name = " 院区ID ")
    @ApiModelProperty(value = "院区ID")
    private String campusid;