Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 a80311f4fb0ecad83e8bc3df59a3d596d637c0ba

 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;