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

weimingfei

5 天以前 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

 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;




}