Merge remote-tracking branch 'origin/dev_dept'

龚焕茏

2024-07-09 0b357d525c83203162eb053aed9c87604156f94a

 src/main/java/com/mindskip/xzs/domain/User.java

@@ -73,14 +73,14 @@
     * 微信openId
     */
    private String wxOpenId;
    private String deptIds;

    /**
     * 是否部门管理员
     */
    private String deptAdmin;

    /**
     * 状况
     */
    private UserConditionEnum condition;

    private String conditionDetail;
}