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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 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);
    }
}