From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
index 740e802..429559b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.domain.SysConfig;
 
 import java.util.List;
@@ -10,7 +11,11 @@
  *
  * @author ruoyi
  */
-public interface ISysConfigService extends IService<SysConfig> {
+public interface ISysConfigService extends IServicePlus<SysConfig> {
+
+
+    TableDataInfo<SysConfig> selectPageConfigList(SysConfig config);
+
     /**
      * 鏌ヨ鍙傛暟閰嶇疆淇℃伅
      *
@@ -57,12 +62,22 @@
      * @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
      * @return 缁撴灉
      */
-    public int deleteConfigByIds(Long[] configIds);
+    public void deleteConfigByIds(Long[] configIds);
 
     /**
-     * 娓呯┖缂撳瓨鏁版嵁
+     * 鍔犺浇鍙傛暟缂撳瓨鏁版嵁
      */
-    public void clearCache();
+    public void loadingConfigCache();
+
+    /**
+     * 娓呯┖鍙傛暟缂撳瓨鏁版嵁
+     */
+    public void clearConfigCache();
+
+    /**
+     * 閲嶇疆鍙傛暟缂撳瓨鏁版嵁
+     */
+    public void resetConfigCache();
 
     /**
      * 鏍¢獙鍙傛暟閿悕鏄惁鍞竴

--
Gitblit v1.9.3