Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 2493985a5bdfc6496381b39de0f9713b79c2e51d

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -172,6 +172,7 @@
        return appUser;
    }

    // todo 短信验证码
    @ResponseBody
    @PostMapping("/base/appUser/getSMSCode")
    @ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
@@ -476,6 +477,7 @@
            if(null != map){
                String out_trade_no = map.get("out_trade_no");
                String trade_no = map.get("trade_no");
                String appUserId = map.get("passback_params");
                ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, trade_no);
                if(resultUtil.getCode() == 200){
                    PrintWriter out = response.getWriter();