Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

6 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java

@@ -59,5 +59,10 @@
    @ApiModelProperty(value = "是否查询固定人员组织主键" ,hidden = true)
    private String companySpecialId;

    @ApiModelProperty(value = "在职状态 0在职 1离职" )
    private Integer workStatus;




}