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

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

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

@@ -23,7 +23,7 @@
    private String storePhone;

    @ApiModelProperty(value = "门店距离当前位置 的距离")
    private long storeDistance;
    private Double storeDistance;

    @ApiModelProperty(value = "门店营业时间范围")
    private String storeTime;