Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -52,6 +52,16 @@ public class SysDept extends BaseEntity
     /** 父部门名称 */
     private String parentName;
 
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 1 职能部门 2 生产部门 3 其他
+     */
+    private int type;
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
@@ -181,6 +191,22 @@ public class SysDept extends BaseEntity
         this.children = children;
     }
 
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -198,6 +224,8 @@ public class SysDept extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("deptCode", getDeptCode())
+            .append("type", getType())
             .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -38,6 +38,16 @@ public class SysPost extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 级别：0-不设置；1-经理；
+     */
+    private Integer postLevel;
+
     /** 用户是否存在此岗位标识 默认不存在 */
     private boolean flag = false;
 
@@ -105,7 +115,23 @@ public class SysPost extends BaseEntity
     {
         this.flag = flag;
     }
-    
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public Integer getPostLevel() {
+        return postLevel;
+    }
+
+    public void setPostLevel(Integer postLevel) {
+        this.postLevel = postLevel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -119,6 +145,8 @@ public class SysPost extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
+            .append("deptId", getDeptId())
+            .append("postLevel", getPostLevel())
             .toString();
     }
 }