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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-other/src/main/java/com/dsh/other/feignclient/model/StoreInfo.java

@@ -14,7 +14,7 @@
    private String storeImg;

    @ApiModelProperty(value = "门店距离当前位置")
    private long distance;
    private double distance;

    @ApiModelProperty(value = "门店名称")
    private String storeName;