Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/user/UserController.java

@@ -47,6 +47,9 @@ public class UserController {
      */
     @PutMapping("/pwd")
     public CzgResult<Boolean> updatePwd(@RequestBody UserInfoPwdEditDTO userInfoPwdEditDTO) {
+        if (!userInfoPwdEditDTO.getPayPwd().equals(userInfoPwdEditDTO.getCheckPayPwd())) {
+            return CzgResult.failure("两次密码不一致");
+        }
         return CzgResult.success(userInfoService.updatePwd(StpKit.USER.getLoginIdAsLong(), userInfoPwdEditDTO));
     }
 

cash-common/cash-common-service/src/main/java/com/czg/account/dto/user/userinfo/UserInfoPwdEditDTO.java

@@ -13,6 +13,8 @@ public class UserInfoPwdEditDTO {
      */
     @NotEmpty(message = "支付密码不为空")
     private String payPwd;
+    @NotEmpty(message = "二次确认支付密码不为空")
+    private String checkPayPwd;
     /**
      * 验证码
      */