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

@@ -20,6 +20,9 @@
    @ApiModelProperty(value = "商户名称")
    private String shopName;

    @ApiModelProperty(value = "商户封面")
    private String shopPicture;

    @ApiModelProperty(value = "商户地址")
    private String shopAddress;