fix:用户修改、新增返回优化

project-interface/src/main/java/com/dituhui/pea/pojo/UserInfo.java

@@ -78,7 +78,7 @@ public class UserInfo {
     /**
      * 最后登录时间
      */
-    //private Date lastLoginTime;
+    private Date lastLoginTime;
     /**
      * 用户自定义条件
      */
@@ -102,14 +102,29 @@ public class UserInfo {
     /**
      * 创建时间
      */
-    // private Date createdTime;
+    private Date createdTime;
     /**
      * 更新人
      */
-    //private String updatedBy;
+    private String updatedBy;
     /**
      * 更新时间
      */
-    // private Date updatedTime;
+    private Date updatedTime;
+
+    /**
+     * 是否禁用 0： 否 1：是  默认0
+     */
+    private Integer ban = 0;
+
+    /**
+     * 用户来源:0：bean 1：新建
+     */
+    private Integer source;
+
+    /**
+     * 工程师工号
+     */
+    private String engineerCode;
 
 }

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -297,7 +297,9 @@ public class UserService {
         // 保存用户信息
         userEntity = userDao.save(userEntity);
         savaUserRoleAndOrgInfo(userInfo);
-        return Result.success(BeanUtil.copyProperties(userEntity, UserInfo.class));
+        UserInfo info = BeanUtil.copyProperties(userEntity, UserInfo.class);
+        info.setPassword(null);
+        return Result.success(info);
     }
 
     /**
@@ -442,6 +444,7 @@ public class UserService {
         userEntity = userDao.save(userEntity);
         savaUserRoleAndOrgInfo(userInfo);
         userInfo = BeanUtil.copyProperties(userEntity, UserInfo.class);
+        userInfo.setPassword(null);
         return Result.success(userInfo);
     }