From 49c5117caef44d1e817d2ef701529dfaf1443467 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 16:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtPopGetVo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtPopGetVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtPopGetVo.java
index 05f122e..e610861 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtPopGetVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtPopGetVo.java
@@ -25,7 +25,7 @@
     @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
     private Integer targetType;
 
-    @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+    @ApiModelProperty(value = "链接类型1.手动输入/跳转地址  2.选择已有/跳转小程序")
     private Integer linkType;
 
 
@@ -48,4 +48,7 @@
     @ApiModelProperty(value = "展示结束时间  yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date showEndTime;
+
+    @ApiModelProperty(value = "小程序APPID")
+    private String appid;
 }

--
Gitblit v1.7.1