From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Pop.java | 8 +++++++-
1 files changed, 7 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 da18b6e..2318efb 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,10 +66,15 @@
@TableField("link_url")
private String linkUrl;
/**
- * 链接类型1.手动输入2.选择已有
+ * 链接类型1.跳转地址，2=跳转小程序
*/
@TableField("link_type")
private Integer linkType;
+ /**
+ * 小程序appid
+ */
+ @TableField("appid")
+ private String appid;
/**
* 跳转活动id
*/
@@ -86,6 +91,7 @@
@TableField("jump_type")
private Integer jumpType;
+
@Override
protected Serializable pkVal() {
return this.popId;
--
Gitblit v1.7.1