Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-17 53d4c0d723402840c3a591664a839f7ce044bd2d

 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java

@@ -38,7 +38,6 @@
     * @param xmlData
     * @return
     */
    @AnonymousAccess
    @RequestMapping("wechatCallback")
    public Object wechatNotify(@RequestBody String xmlData) {
        return userOrderService.payWechatNotify(xmlData);
@@ -49,7 +48,6 @@
     *
     * @return
     */
    @AnonymousAccess
    @RequestMapping("alipayCallback")
    public Object alipayCallback(HttpServletRequest request) {
        log.info("这里是支付宝回调");