From 3bdce12a951b2e04f4ceffc318caea6df113e874 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 02 十一月 2022 11:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
index ae36071..b3a11b9 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java
@@ -40,7 +40,7 @@
     /**
      * @description 分页获取风险管控措施
      */
-    List<PreventRiskControlMeasure> listRiskEvenByCondition(Byte controlType, Long riskEventId);
+    List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(Byte controlType, Long riskEventId);
 
 
 
@@ -52,7 +52,6 @@
      * 修改上报的风险管控措施状态
      */
     void updateMeasureReportStatus(HandlerReportParam handlerReportParam);
-    List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(Byte controlType, Long riskEventId);
 
     /**
      * 管控措施-不分页查询

--
Gitblit v1.9.2