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/ISysDictDataService.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
index 62babb2..570c7d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
@@ -1,7 +1,8 @@
 package com.ruoyi.system.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.List;
 
@@ -10,7 +11,11 @@
  *
  * @author ruoyi
  */
-public interface ISysDictDataService extends IService<SysDictData> {
+public interface ISysDictDataService extends IServicePlus<SysDictData> {
+
+
+    TableDataInfo<SysDictData> selectPageDictDataList(SysDictData dictData);
+
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瀛楀吀鏁版嵁
      *
@@ -42,7 +47,7 @@
      * @param dictCodes 闇�瑕佸垹闄ょ殑瀛楀吀鏁版嵁ID
      * @return 缁撴灉
      */
-    public int deleteDictDataByIds(Long[] dictCodes);
+    public void deleteDictDataByIds(Long[] dictCodes);
 
     /**
      * 鏂板淇濆瓨瀛楀吀鏁版嵁淇℃伅

--
Gitblit v1.9.3