Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 src/main/java/com/mzl/flower/web/init/InitResource.java

@@ -36,7 +36,7 @@
        return returnData(R.SUCCESS.getCode(), null);
    }

    @GetMapping("/callback")
    /*@GetMapping("/callback")
    public ResponseEntity<ReturnDataDTO> callback(String orderId) {
        String originalXml = "";
        UserPaymentDTO dto = new UserPaymentDTO();
@@ -50,5 +50,5 @@
        userPaymentV3Service.saveCallbackInfo(dto, Constants.ORDER_STATUS_BACKEND.PAYMENT.name());

        return returnData(R.SUCCESS.getCode(), null);
    }
    }*/
}