From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java
index 5ecd417..da18b6e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java
@@ -66,6 +66,11 @@
@TableField("link_url")
private String linkUrl;
/**
+ * 链接类型1.手动输入2.选择已有
+ */
+ @TableField("link_type")
+ private Integer linkType;
+ /**
* 跳转活动id
*/
@TableField("jump_id")
@@ -76,7 +81,7 @@
private Long createUserId;
/**
- * 跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂
+ * 跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂6.赚取积分7.建议有奖
*/
@TableField("jump_type")
private Integer jumpType;
--
Gitblit v1.7.1