Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 2493985a5bdfc6496381b39de0f9713b79c2e51d

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

@@ -142,7 +142,7 @@
     */
    @ResponseBody
    @PostMapping("/base/pointMer/exchangeGoodPaymentWeChatCallback")
    public void addVipPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
    public void exchangeGoodPaymentWeChatCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
            if(null != map){