From def325eb00744bae8f3494ddb253fe202ad76520 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期日, 07 四月 2024 18:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
index 518e882..9a2b177 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
@@ -1,6 +1,8 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.CheckRule;
+import com.ycl.platform.domain.query.CheckRuleQuery;
+import com.ycl.platform.domain.vo.CheckRuleVO;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.service.ICheckRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +30,7 @@
* @return 鑰冩牳瑙勫垯
*/
@Override
- public CheckRule selectCheckRuleById(Long id)
+ public CheckRuleVO selectCheckRuleById(Long id)
{
return checkRuleMapper.selectCheckRuleById(id);
}
@@ -36,13 +38,13 @@
/**
* 鏌ヨ鑰冩牳瑙勫垯鍒楄〃
*
- * @param checkRule 鑰冩牳瑙勫垯
+ * @param checkRuleQuery 鑰冩牳瑙勫垯
* @return 鑰冩牳瑙勫垯
*/
@Override
- public List<CheckRule> selectCheckRuleList(CheckRule checkRule)
+ public List<CheckRuleVO> selectCheckRuleList(CheckRuleQuery checkRuleQuery)
{
- return checkRuleMapper.selectCheckRuleList(checkRule);
+ return checkRuleMapper.selectCheckRuleList(checkRuleQuery);
}
/**
--
Gitblit v1.8.0