From c6f15400d502852b43acefcd33dbcfbb4610b5fc Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期六, 18 三月 2023 18:10:20 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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 78fb676..4108f01 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 @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -26,9 +28,11 @@ * @param code * @return */ - DataDictionary queryByCode(String code); + List<DataDictionary> queryByCode(String code,String keyword); Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork); - Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord); + Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord); + + List<DataDictionaryVo> queryTreeType(String typeCode, Integer level); } -- Gitblit v1.8.0