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

无关风月

2025-09-01 324ed9fac852bc4117ee0da65a586adef258bd52

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/NearbyShopVO.java

@@ -16,8 +16,10 @@
    @ApiModelProperty(value = "门店名称")
    private String name;

    @ApiModelProperty(value = "详细地址")
    @ApiModelProperty(value = "商家地址")
    private String address;
    @ApiModelProperty(value = "详细地址")
    private String detailAddress;

    @ApiModelProperty(value = "距离")
    private Double distance;