From 8f37a2de432a8d4d77f94dcf45d0b86ce3006ee2 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 18 八月 2025 14:47:35 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java index f2671df..21b24b2 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/ConponJsonRuleModel.java @@ -4,7 +4,6 @@ import lombok.Data; - @Data public class ConponJsonRuleModel { /** @@ -20,7 +19,7 @@ /** * 体验券名称 */ - @ApiModelProperty("体验券名称 ") + @ApiModelProperty("体验券名称/抵扣券商品名称 ") String experienceName; } -- Gitblit v1.7.1