From 90615ce702dde7f1d8fed373d8f3a96796ef1f2d Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 21 十一月 2024 09:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervision/hc-recheck-1114'

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/EvaluationsubruleService.kt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/EvaluationsubruleService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/EvaluationsubruleService.kt
index d96c2aa..3558f62 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/EvaluationsubruleService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/EvaluationsubruleService.kt
@@ -1,5 +1,6 @@
 package cn.flightfeather.supervision.lightshare.service
 
+import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule
 import cn.flightfeather.supervision.domain.ds1.entity.Evaluationsubrule2
 import cn.flightfeather.supervision.lightshare.vo.ScoreDetail
 
@@ -7,7 +8,7 @@
 interface EvaluationsubruleService {
     fun findOne(id:String): Evaluationsubrule2
 
-    fun findAll(): MutableList<Evaluationsubrule2>
+    fun findAll(): MutableList<Evaluationsubrule>
 
     fun save(evaluationsubrule: Evaluationsubrule2): Int
 

--
Gitblit v1.9.3