Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 e38dbee7e43f6af65c7e9307d936a1c48e4bb539

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

@@ -24,9 +24,9 @@

    IPage<Shop> selectShopList(@Param("page") Page<Shop> page,@Param("shop") Shop shop);

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

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

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