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/vo/MgtPopGetVo.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 3dc8690..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,20 +25,21 @@
@ApiModelProperty(value = "链接类型1.外部2.内部3.无")
private Integer targetType;
- @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+ @ApiModelProperty(value = "链接类型1.手动输入/跳转地址 2.选择已有/跳转小程序")
private Integer linkType;
+
@ApiModelProperty(value = "链接地址")
private String linkUrl;
- @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
+ @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂6.赚取积分7.建议有奖")
private Integer jumpType;
@ApiModelProperty(value = "跳转id")
private String jumpId;
@ApiModelProperty(value = "pop排序")
- private String popSort;
+ private Integer popSort;
@ApiModelProperty(value = "展示开始时间 yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -47,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