From e986bd63309fba70f7f3cfaf70aadec46220917b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 30 三月 2023 20:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java b/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
index 2eac3e0..587582b 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.vo.ViolationSettingVO;
+import com.ycl.vo.dict.DataDictionaryVo;
import java.util.List;
@@ -27,9 +28,11 @@
* @param code
* @return
*/
- List<DataDictionary> queryByCode(String code);
+ List<DataDictionary> queryByCode(String code,String keyword);
- Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork);
+ Page listIllegalBuildingSettings(Integer current, Integer size, String keyWork);
- Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord);
+ Page listViolations(Integer current, Integer size, String keyWord);
+
+ List<DataDictionaryVo> queryTreeType(String typeCode, Integer level);
}
--
Gitblit v1.8.0