From 945561a655919045c3086f00d7d16dbc1d24c23f Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 18 三月 2024 10:57:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java | 3 +++ 1 files changed, 3 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 333537c..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; -- Gitblit v1.7.1