修改用户新增可以修改密码

src/main/java/com/gxwebsoft/common/system/controller/UserController.java

@@ -196,12 +196,13 @@ public class UserController extends BaseController {
     public ApiResult<?> update(@RequestBody User user) {
         user.setStatus(null);
         user.setUsername(null);
-        user.setPassword(null);
         if (user.getPassword() != null) {
             String pwd = userService.encodePassword(user.getPassword());
             User originData = userService.getByIdRel(user.getUserId());
             if(!pwd.equals(originData.getPassword())) {
                 user.setPassword(pwd);
+            }else {
+                user.setPassword(null);
             }
         }
         if (userService.updateUser(user)) {