Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-09 6b12805b53f7a6d131b5cffcf45e3b3c68336568

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

@@ -19,4 +19,6 @@
    List<GoodsVO> goodsList(Goods goods);

    GoodsVO goodsDetail(Long goodsId);

    List<Goods> getGoodsListByShopId(Integer shopId);
}