From e961f056e30efbfea5357f1bcbbb68c8d495e325 Mon Sep 17 00:00:00 2001 From: liyanqi <15181887205@163.com> Date: 星期一, 31 十月 2022 15:51:21 +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 | 5 +++-- 1 files changed, 3 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..2eac3e0 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,7 @@ 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 java.util.List; @@ -26,9 +27,9 @@ * @param code * @return */ - DataDictionary queryByCode(String code); + List<DataDictionary> queryByCode(String code); Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork); - Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord); + Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord); } -- Gitblit v1.8.0