Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java

@@ -161,6 +161,7 @@
            e.printStackTrace();
        }
    }

    @PostMapping("/weixinPayHuiminCallback1")
    public void weixinPayHuiminCallback1(HttpServletRequest request, HttpServletResponse response) {
        try {