From 399a115e33dfb070bb74540bad0ca66f799d53a7 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 03 四月 2025 15:19:53 +0800
Subject: [PATCH] 1

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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 d50b289..310c633 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
@@ -5,9 +5,12 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -88,7 +91,17 @@
      *有效期 不填表示永久
      */
     @TableField("endTime")
+    @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")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
     /**
      *可使用时间段,周,多个逗号分隔
      */
@@ -127,8 +140,8 @@
     /**
      *门店id
      */
-    @TableField("storeId")
-    private Integer storeId;
+    @TableField("storeIds")
+    private String storeIds;
     /**
      *运营商id
      */
@@ -136,6 +149,20 @@
     private Integer operatorId;
 
 
+    /**
+     *状态 1已上架 2已下架 3已删除
+     */
+    @ApiModelProperty(value = "状态 1已上架 2已下架 3已删除 ")
+    @TableField("status")
+    private Integer status;
+
+
+
+    @TableField(exist = false)
+    private String startTimeStr;
+    @TableField(exist = false)
+    private String endTimeStr;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

--
Gitblit v1.7.1