From 83070ae1b6c99bff833b9a43910b58b970037383 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 14:40:25 +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/entity/THuiminCard.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
index 2111991..64ac795 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
@@ -108,12 +108,7 @@
@TableField("endTime")
@ApiModelProperty(value = "有效期开始时间 不填表示永久")
private Date endTime;
- /**
- *有效期结束时间 不填表示永久
- */
- @TableField("startTime")
- @ApiModelProperty(value = "有效期结束时间 不填表示永久")
- private Date startTime;
+
/**
*可使用时间段，周，多个逗号分隔
*/
@@ -123,14 +118,14 @@
/**
*可使用时间段，时分秒，多个逗号分隔
*/
- @ApiModelProperty(value = "可使用时间段，时分秒，多个逗号分隔")
+ @ApiModelProperty(value = "可使用时间段，时分秒，多个逗号分隔,跨周分号分隔")
@TableField("useTimes")
private String useTimes;
/**
*不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
*/
@TableField("unUseTimes")
- @ApiModelProperty(value = "可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔")
+ @ApiModelProperty(value = "不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔")
private String unUseTimes;
/**
*使用范围1门店2场地
@@ -157,18 +152,25 @@
@ApiModelProperty(value = "排序")
@TableField("sort")
private String sort;
+
/**
- *门店id 当使用范围为场地的时候存储门店id
+ *运营商id
*/
- @ApiModelProperty(value = "门店id ")
- @TableField("storeId")
- private Integer storeId;
+ @ApiModelProperty(value = "运营商id")
+ @TableField("operatorId")
+ private Integer operatorId;
/**
*状态 1已上架 2已下架 3已删除
*/
@ApiModelProperty(value = "状态 1已上架 2已下架 3已删除 ")
@TableField("status")
private Integer status;
+ /**
+ *门店ids
+ */
+ @ApiModelProperty(value = "门店ids")
+ @TableField("storeIds")
+ private String storeIds;
@ApiModelProperty("是否购买 0否1是")
@TableField(exist = false)
--
Gitblit v1.7.1