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

huliguo

17 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -21,13 +21,13 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty("商户名称")
    @ApiModelProperty(value="商户名称")
    private String shopName;

    @ApiModelProperty("店铺地址")
    @ApiModelProperty(value="店铺地址")
    private String shopAddress;

    @ApiModelProperty("店主姓名")
    @ApiModelProperty(value="店主姓名")
    private String shopownerName;

    @ApiModelProperty(value = "分成比例")