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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

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

@@ -51,6 +51,7 @@
    @ResponseBody
    @PostMapping("/userCouponPayment/updateUserCouponPayment")
    public void updateUserCouponPayment(@RequestBody UserCouponPayment userCouponPayment){
        userCouponPayment.setUserId(null);
        userCouponPaymentService.updateById(userCouponPayment);
    }
}