Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 fc3dd371c6dcbafa375b158abf98dd63afdc244e

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java

@@ -21,4 +21,5 @@
    List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude);

    ShopDetailVO getShopDetail(Integer shopId, BigDecimal longitude, BigDecimal latitude);

}