From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 04 七月 2025 20:39:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java index f81f1dd..1602a18 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java @@ -23,18 +23,28 @@ @ApiModelProperty(value = "商户名称") private String shopName; - @ApiModelProperty("店主姓名") + @ApiModelProperty(value="店主姓名") private String shopownerName; - @ApiModelProperty("店主联系方式") + @ApiModelProperty(value="店主联系方式") private String shopownerPhone; - @ApiModelProperty("认证类型") + @ApiModelProperty(value="认证类型") private String mainType; - @ApiModelProperty("审核状态") + @ApiModelProperty(value="审核状态0待进件1资料校验中2待账户验证3审核中4已驳回5待签约6完成7已冻结8已作废") private Integer auditStatus; - @ApiModelProperty("审核状态描述") + @ApiModelProperty(value="审核状态描述") private String auditStatusDesc; + + @ApiModelProperty(value = "签约状态1待签约2已签约3无法签约") + private Integer signState; + + @ApiModelProperty(value = "签约链接") + private String signUrl; + + @ApiModelProperty(value = "分账方标记1是0否 auditStatus=6,accountFlag=0的时候需要添加分账方操作") + private Integer accountFlag; + } -- Gitblit v1.7.1