代码合并

bi-server/src/main/java/com/usoftchina/bi/server/service/user/UserService.java

@@ -71,8 +71,8 @@ public class UserService {
                 if(null == _user){
                     userMapper.addUser(user);
                 }else{
-                    user.setPhone(userName);
-                    userMapper.updateUser(user);
+                    _user.setPhone(userName);
+                    userMapper.updateUser(_user);
                 }
             }else{
                 userMapper.addUser(user);