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

# Conflicts:
#	log.path_IS_UNDEFINED/sys-user.log

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;