Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java

@@ -16,9 +16,9 @@
 */
public interface ISysOssService extends IServicePlus<SysOss, SysOssVo> {

   TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss);
    TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss);

   SysOss upload(MultipartFile file);
    SysOss upload(MultipartFile file);

   Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}