Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 bad6c62c063a701af797d5bed697af1264e7a370

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