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/StaffShopInfoGetVo.java

@@ -44,6 +44,9 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(value="商店类型1.经销商2.代理商")
    private Integer shopType;

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