Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 457b40e054a68d0dc5b5fc755cdf468e5d37ab28

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

@@ -8,7 +8,7 @@
public class NearbyShopVO {

    @ApiModelProperty(value = "门店id")
    private Integer id;
    private Long id;

    @ApiModelProperty(value = "封面图片")
    private String homePicture;