Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-20 1ebf83b7b8ae636f00d49406e4c9bbff2d73c34d

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

}