From 922e8c6763f9c8cd0311267b531b8b684ac5ea59 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期六, 08 十月 2022 17:41:26 +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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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..3e5d198 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;
 
@@ -30,5 +31,5 @@
 
     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