From 02b3d183f55ed5366421fe4104b93d021da86ee9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 19:39:12 +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/THuiminCard.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
index 310c633..68fde36 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
@@ -91,17 +91,20 @@
*有效期 不填表示永久
*/
@TableField("endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
- *有效期结束时间 不填表示永久
+ *有效期开始时间
*/
@TableField("startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
+
+
+
/**
*可使用时间段，周，多个逗号分隔
*/
@@ -112,11 +115,13 @@
*/
@TableField("useTimes")
private String useTimes;
- /**
- *不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
- */
+// /**
+// *不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
+// */
@TableField("unUseTimes")
private String unUseTimes;
+
+
/**
*使用范围1门店2场地
*/
--
Gitblit v1.7.1