Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 abdd896a66eced1355a24ea5eabbee497a745fe5

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

@@ -80,7 +80,13 @@
     */
    private String deptAdmin;

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

    /**
     * 具体情况
     */
    private String conditionDetail;
}