Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/modules/app/entity/UserEntity.java

@@ -208,8 +208,5 @@ public class UserEntity implements Serializable {
     private Integer vipType;
 
 
-    public UserEntity getDesensitizationInfo() {
-        this.setPassword(null);
-        return this;
-    }
+
 }

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -915,7 +915,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         }
         userInfo.setUpdateTime(DateUtil.date().toString());
         baseMapper.updateById(userInfo);
-        return getResult(userInfo.getDesensitizationInfo());
+        return getResult(userInfo);
     }
 
     @Override
@@ -972,7 +972,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         if (userEntity != null) {
             inviteService.saveBody(userInfo.getUserId(), userEntity);
         }
-        return getResult(userInfo.getDesensitizationInfo());
+        return getResult(userInfo);
     }
 
     @Override