Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-09 97c5552f705e03a3a6e5864e3be6b1078844a4d3

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

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

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

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