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/vo/MgtAllCustomConfigVo.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java
index c720025..811ccc0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java
@@ -45,6 +45,9 @@
@ApiModelProperty(value = "合作商状态")
private String shopCustomStatus;
+ @ApiModelProperty(value = "商户统一分成比例")
+ private String shopCommonProportion;
+
@ApiModelProperty(value = "来源渠道")
private String shopSourceChannel;
@@ -75,10 +78,13 @@
@ApiModelProperty(value = "链接类型1.外部2.内部3.无")
private Integer targetType;
+ @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")
@@ -86,4 +92,11 @@
@ApiModelProperty(value = "活跃度list")
private List<MgtActivenessVo> mgtActivenessVoList;
+
+ @ApiModelProperty(value = "门店课程设置-展示名称")
+ private String storeCourseDisplayName;
+
+ @ApiModelProperty(value = "门店课程设置-验证密码")
+ private String storeCourseDisplayPassword;
+
}
--
Gitblit v1.7.1