Merge remote-tracking branch 'origin/master' into xizang-changyun

yupeng

2025-02-05 c885f99c9ff1445f6975d16faf4a23006cd5763b

 ruoyi-system/src/main/java/com/ruoyi/system/service/TTenantService.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;

/**
 * <p>
@@ -20,5 +21,5 @@
     * @param query
     * @return
     */
    PageInfo<TTenant> pageList(TTenantQuery query);
    PageInfo<TenantVO> pageList(TTenantQuery query);
}