From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java
index 5ae4606..97e0dc7 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.models.auth.In;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
+
/**
* @author zhibing.pu
@@ -22,7 +24,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 位置（1=首页，2=首页底部，3=线上课得积分，4=看视频得奖励，5=常见问题）
+ * 位置（1=首页，2=线上课得积分，3=看视频得奖励，4=常见问题）
*/
@TableField("position")
private Integer position;
@@ -32,10 +34,10 @@
@TableField("img")
private String img;
/**
- * 跳转页面
+ * 跳转页面id
*/
@TableField("jumpPage")
- private String jumpPage;
+ private Integer jumpPage;
/**
* 排序
*/
@@ -50,6 +52,7 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
/**
* 跳转模块
@@ -72,13 +75,14 @@
@TableField("turnId")
private String turnId;
/**
- * 跳转页面id
+ * 跳转页面
*/
- @TableField("pageId")
- private Integer pageId;
+ @TableField("page")
+ private String page;
/**
* 跳转类型id
*/
@TableField("typeId")
private Integer typeId;
}
+
--
Gitblit v1.7.1