From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
index b5dc078..866f2c4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysOss;
@@ -16,9 +17,9 @@
*/
public interface ISysOssService extends IServicePlus<SysOss, SysOssVo> {
- TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss);
+ TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss, PageQuery pageQuery);
- SysOss upload(MultipartFile file);
+ SysOss upload(MultipartFile file);
- Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+ Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}
--
Gitblit v1.9.3