Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

16 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java

@@ -44,6 +44,7 @@
    @ApiModelProperty(value = "签约链接")
    private String signUrl;


    @ApiModelProperty(value = "分账方标记1是0否  auditStatus=6,accountFlag=0的时候需要添加分账方操作")
    private Integer accountFlag;

}