Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 64934df4bec0b1447b8835371213c5decefb1325

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

@@ -21,7 +21,7 @@

    PageInfo<GoodsVO> goodsList(Goods goods);

    GoodsVO goodsDetail(Long goodsId);
    GoodsVO goodsDetail(Long goodsId, String longitude, String latitude);

    List<Goods> getGoodsListByShopId(PageInfo<Goods> pageInfo, Integer shopId);