Merge remote-tracking branch 'origin/master' into gsw

# Conflicts: # log.path_IS_UNDEFINED/sys-user.log
1 year ago · 8ea28cfeae
2 changed files with 0 additions and 3 deletions
--- a/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysCaptchaController.class
+++ b/ruoyi-admin/target/classes/com/ruoyi/web/controller/system/SysCaptchaController.class
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@ -31,9 +31,6 @@ public class SysDept extends BaseEntity
    /** 部门名称 */
    private String deptName;

-    /** 部门编号*/
-    private String deptNumber;
-
    /** 显示顺序 */
    private String orderNum;