Merge remote-tracking branch 'origin/master'

k94314517

2025-03-20 4d07cbcdf7ba44d3d4bab144536c0287f6c9ef32

 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;




}