From e900ccb94046eabeff772f51c9492c3d8cfa2941 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 18 八月 2025 10:40:58 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/Coupon.java | 13 +++++++++++++ 1 files changed, 13 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 fa8977e..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 @@ -77,11 +77,17 @@ /** * 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; /** * 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; + /** + * 有效期 + */ + private String timeValue; /** * 使用范围(1=全国,2=指定城市,3=指定门店) */ @@ -126,5 +132,12 @@ * 城市管理者id */ private Integer cityManagerId; + /** + * 数量 + */ + private Integer count; + private String useScopeValue; + private String typeValue; + private String userPopulationValue; } -- Gitblit v1.7.1