合并代码提交

2022-11-17 15:10:16 +08:00
parent f368ebd623
commit 52645fa5b0
3 changed files with 63 additions and 62 deletions
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
@@ -24,6 +24,8 @@ public class DeptDTO implements Serializable {

    private String name;

+    private String code;
+
    private String area;

    private String remark;
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Dept.java
@@ -41,7 +41,6 @@ public class Dept extends BaseEntity {
    /**
     * 部门编号
     */
-    @TableField(exist=false)
    private String code;

    /**