From f38d69d70e3e126d2f58971d0b4854f2aa144fc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 22 八月 2025 14:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index d1b71e2..3963a6a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/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);
                 }
             }

--
Gitblit v1.7.1