From 0381d6fdd6831eb0abdd8bdd90a4a6a7b6e9026c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 十二月 2024 10:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java
index 9bab6e6..480fde1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Banner.java
@@ -37,10 +37,17 @@
     @TableField("name")
     private String name;
 
+    @ApiModelProperty(value = "1图片2视频")
+    @TableField("content_type")
+    private Integer contentType;
+
     @ApiModelProperty(value = "跳转类型(1=无跳转,2=外部链接,3=商品详情,4=秒杀商品详情,5=领券中心)")
     @TableField("jump_type")
     private Integer jumpType;
 
+    @TableField("content_type")
+    private Integer contentType;
+
     @ApiModelProperty(value = "跳转内容")
     @TableField("content")
     private String content;

--
Gitblit v1.7.1