Merge remote-tracking branch 'origin/master'

xuhy

2024-08-20 c4558ef096db556d234bf04fe797dc2d17ec13ee

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java

@@ -20,5 +20,6 @@
public interface TGoodsMapper extends BaseMapper<TGoods> {

    List<TGoods> pageList(@Param("pageInfo")PageInfo<TGoods> pageInfo, @Param("req") GoodsDTO dto);
    List<TGoods> pageList1(@Param("pageInfo")PageInfo<TGoods> pageInfo);

}