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

huliguo

6 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopProportionPageDto.java

@@ -17,5 +17,6 @@
    @ApiModelProperty(value = "商户类型1经销商2代理商")
    private Integer shopType ;


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