From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 16 十二月 2023 17:08:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java |   11 ++++++++---
 1 files changed, 8 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 3e5d198..5273142 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,13 @@
      * @param code
      * @return
      */
-    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);
+
+    List<DataDictionary> queryByRemark(String remark);
 }

--
Gitblit v1.8.0