From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 4ad7c50..0628825 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
@@ -103,18 +103,20 @@
@TableField("banner")
private String banner;
- /**
- *有效期开始时间 不填表示永久
- */
- @TableField("endTime")
- @ApiModelProperty(value = "有效期开始时间 不填表示永久")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
+
/**
*有效期结束时间 不填表示永久
*/
- @TableField("startTime")
+ @TableField("endTime")
@ApiModelProperty(value = "有效期结束时间 不填表示永久")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ /**
+ *有效期开始时间 不填表示永久
+ */
+ @TableField("startTime")
+ @ApiModelProperty(value = "有效期开始时间 不填表示永久")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
/**
@@ -140,7 +142,6 @@
*/
@TableField("useScope")
@ApiModelProperty(value = "使用范围1门店2场地")
-
private Integer useScope;
/**
*根据适用范围，存储门店id或场地id，多个逗号分隔
@@ -159,7 +160,7 @@
*/
@ApiModelProperty(value = "排序")
@TableField("sort")
- private String sort;
+ private Integer sort;
/**
*门店id 当使用范围为场地的时候存储门店id
@@ -196,6 +197,24 @@
*/
@TableField(exist = false)
private Integer buyCount;
+ @TableField(exist = false)
+ private Long current;
+ @TableField(exist = false)
+ private Long size;
+ /**
+ * 惠民卡状态：1未开始 2已开始 3已结束
+ */
+ @TableField(exist = false)
+ private Integer huiMinStatus;
+
+ /**
+ * 1=平台，2=城市管理员，3=门店
+ */
+ @TableField(exist = false)
+ private Integer objectType;
+
+ @TableField(exist = false)
+ private Integer objectId;
@Override
--
Gitblit v1.7.1