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

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -360,6 +360,7 @@
                    vipDetail.setUserCouponId(userCoupon.getId());
                    vipDetailService.save(vipDetail);
                    userCoupon.setVipDetailId(vipDetail.getId());
                    userCoupon.setUserId(null);
                    userCouponService.updateById(userCoupon);
                }
            }