Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-11 ccca8c65b3c76a9021a471a3667d61d965a4f2cb

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

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

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

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