From 51f26723bee741bf112c8d0d965d0e2f2974bd04 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 31 三月 2025 10:02:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideoClassification.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideoClassification.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideoClassification.java
index f1fe293..94d30fe 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideoClassification.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/BenefitsVideoClassification.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -39,5 +40,11 @@
      * 添加时间
      */
     @TableField("insertTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date insertTime;
+    /**
+     * 状态 1=正常 2=下架 3=删除
+     */
+    @TableField("state")
+    private Integer state;
 }

--
Gitblit v1.7.1