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

huliguo

6 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

@@ -22,6 +22,9 @@
    @ApiModelProperty(value="商户状态0冻结1正常2终止合作")
    private Integer shopStatus;

    @ApiModelProperty(value = "商户图片")
    private String shopPicture;

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