From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 51b682f..cb1e865 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,6 +78,9 @@
@ApiModelProperty(value = "链接类型1.外部2.内部3.无")
private Integer targetType;
+ @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+ private Integer linkType;
+
@ApiModelProperty(value = "链接地址")
private String linkUrl;
--
Gitblit v1.7.1