Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 5b0689db42b735f4f16e5aecb7437484b3c7d97d

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