From a8b2b318c1e6bb1ae155aa9ca6043eeb47bbfe7a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 29 九月 2022 17:48:48 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
index dc16764..55b9609 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.dict.DataDictionary;
+import com.ycl.vo.ViolationSettingVO;
/**
* <p>
@@ -16,5 +17,5 @@
Page<DataDictionary> listDataDictionaryPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
- Page<DataDictionary> listViolationPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
+ Page<ViolationSettingVO> listViolationPage(Page<ViolationSettingVO> dataDictionaryPage, String keyWord);
}
--
Gitblit v1.8.0