Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/web/ServiceInfoController.java

@@ -115,7 +115,7 @@ public class ServiceInfoController {
     @PostMapping("/getServiceListPageByCurrentUser")
     @SysLogger("getServiceListPageByCurrentUser")
     @Transactional
-    public RespDTO getServiceListPageByCurrentUser(@RequestBody Page<ServiceInfo> page) {
+    public RespDTO getServiceListPageByCurrentUser(@RequestBody Page page) {
         IPage<ServiceInfo> list = serviceInfoFacade.getServiceListPageByCurrentUser(page);
         return RespDTO.onSuc(list);
     }

user-service/src/main/java/com/diagbot/dto/UserLoginDTO.java

@@ -40,6 +40,17 @@ public class UserLoginDTO {
     private String typeCn;
 
 
+    /**
+     * 所属部门
+     */
+    private String dept;
+
+    /**
+     * 所属岗位
+     */
+    private String position;
+
+
     public String getTypeCn() {
         return ConstantEnum.getName(this.type);
     }

user-service/src/main/java/com/diagbot/entity/User.java

@@ -73,22 +73,20 @@ public class User implements Serializable {
     private String email;
 
     /**
-     * 用户类型
+     * 所属部门
      */
-    private Integer type;
-
+    private String dept;
 
-    public Integer getType() {
-        return type;
-    }
+    /**
+     * 所属岗位
+     */
+    private String position;
 
-    public void setType(Integer type) {
-        this.type = type;
-    }
+    /**
+     * 用户类型
+     */
+    private Integer type;
 
-    public static long getSerialversionuid() {
-        return serialVersionUID;
-    }
 
     public Long getId() {
         return id;
@@ -170,6 +168,31 @@ public class User implements Serializable {
         this.email = email;
     }
 
+    public String getDept() {
+        return dept;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+
     @Override
     public String toString() {
         return "User{" +
@@ -183,6 +206,8 @@ public class User implements Serializable {
                 ", username='" + username + '\'' +
                 ", linkman='" + linkman + '\'' +
                 ", email='" + email + '\'' +
+                ", dept='" + dept + '\'' +
+                ", position='" + position + '\'' +
                 ", type=" + type +
                 '}';
     }

user-service/src/main/resources/mapper/UserMapper.xml

@@ -13,6 +13,8 @@
         <result column="modifier" property="modifier"/>
         <result column="password" property="password"/>
         <result column="username" property="username"/>
+        <result column="dept" property="dept"/>
+        <result column="position" property="position"/>
         <result column="linkman" property="linkman"/>
         <result column="email" property="email"/>
         <result column="type" property="type"/>