Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-13 693afdd881d1ffcd31dcf4e40e562fd0f88b309b

 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);