Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-09 74b2581c8a9be309ca6454da3ff2c56501368771

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/ShopMapper.java

@@ -26,8 +26,8 @@

    List<NearbyShopVO> selectNearbyShopList(@Param("longitude") BigDecimal longitude,@Param("latitude") BigDecimal latitude);

    ShopDetailVO selectShopDetail(Integer shopId);
    ShopDetailVO selectShopDetail(@Param("shopId") Integer shopId);

    ShopStatistics getShopStatistics(String shopName);
    ShopStatistics getShopStatistics(@Param("shopId") Integer shopId);

}