From 4f5d220cd175b1cb48c6fc91cb02cb12f6114746 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 18 八月 2025 11:10:18 +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 | 2 +-
1 files changed, 1 insertions(+), 1 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 3b49b8b..4f062f7 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
@@ -364,7 +364,7 @@
}
String ticketJson = grantCoupon.getTicketJson();
if (StringUtils.hasLength(ticketJson)) {
- // 赠送优惠券
+ // 赠送门票
JSONArray objects = JSON.parseArray(ticketJson);
for (Object object : objects) {
JSONObject jsonObject = (JSONObject) object;
--
Gitblit v1.7.1