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

@@ -12,8 +12,11 @@
@Data
public class AppNearShopVo {


    private Long shopId;

    private Float distance;

    private String longitude;

    private String latitude;
}