--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/user/UserController.java

@@ -138,7 +138,7 @@ public class UserController {
 	}
 	@ApiOperation(value = "修改密码", notes = "0：成功；")
 	@PostMapping(value = SysUserRequestPath.UPDATE_PWD)
-	public CallBack<String> updatePassword(UpdatePasswordForm form) {
+	public CallBack<String> updatePassword(@RequestBody UpdatePasswordForm form) {
 		User user = userSerivce.selectByPrimaryKey("11");
 		if (!user.getPassword().toLowerCase().equals(form.getOldPassword().toLowerCase())) {
 			throw new BaseException(1, "旧密码错误");
@@ -147,10 +147,10 @@ public class UserController {
 		if (!form.getNewPassword1().toLowerCase().equals(form.getNewPassword2().toLowerCase())) {
 			throw new BaseException(2, "两次密码不一致");
 		}
-		User m = new User();
-		m.setUserId(user.getUserId());
-		m.setPassword(form.getNewPassword1().toUpperCase());
-		userSerivce.updateByPrimaryKeySelective(m);
+		/*User m = new User();
+		user.setUserId(user.getUserId());*/
+		user.setPassword(form.getNewPassword1().toUpperCase());
+		userSerivce.updateByPrimaryKeySelective(user);
 		return CallBack.success("成功");
 	}
 	@ApiOperation(value = "查看当前绑定账号", notes = "当前绑定账号")