Merge remote-tracking branch 'origin/master'

无关风月

2025-01-23 e6fc35920ded81df2642ad4b79a74ab3092d449f

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTenantMapper.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TTenantQuery;
import com.ruoyi.system.vo.TenantVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -24,7 +25,7 @@
     * @param pageInfo
     * @return
     */
    List<TTenant> pageList(@Param("query") TTenantQuery query, @Param("pageInfo")PageInfo<TTenant> pageInfo);
    List<TenantVO> pageList(@Param("query") TTenantQuery query, @Param("pageInfo")PageInfo<TenantVO> pageInfo);


}