Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 384fa29861a5e62ef6b2a2a2b83e75302bed41dc

 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, String longitude, String latitude);
    GoodsVO goodsDetail(Long goodsId, Integer shopId, String longitude, String latitude);

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