From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java
index d299f01..6572476 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java
@@ -85,6 +85,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endTime;
/**
+ * 有效期
+ */
+ private String timeValue;
+ /**
* 使用范围（1=全国，2=指定城市，3=指定门店）
*/
private Integer useScope;
@@ -128,5 +132,12 @@
* 城市管理者id
*/
private Integer cityManagerId;
+ /**
+ * 数量
+ */
+ private Integer count;
+ private String useScopeValue;
+ private String typeValue;
+ private String userPopulationValue;
}
--
Gitblit v1.7.1