Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

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

@@ -6,6 +6,7 @@
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
import com.ruoyi.other.vo.ShopStatistics;
import org.apache.ibatis.annotations.Param;

import java.math.BigDecimal;
@@ -27,4 +28,6 @@

    ShopDetailVO selectShopDetail(Integer shopId);

    ShopStatistics getShopStatistics(String shopName);

}