From 5f77609d5118737e135c6ca3add168ad01aa52b6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 十一月 2024 16:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java
index 9e9d362..a4f46fc 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java
@@ -4,7 +4,6 @@
import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
import com.zt.life.modules.mainPart.taskReliability.model.ModelRbd;
import com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel;
-import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
@@ -23,11 +22,12 @@
List<OperatConditModel> getList(Map<String, Object> params);
- List<ModelRbd> getModelList(Long productId);
+ List<ModelRbd> getModelList(Map<String, Object> productId);
List<ModelNodes> getModelNodes(Long shipId);
void deleteByOperatConditId(Long operatConditId);
List<OperatConditModel> getGKModelTrees(Long productId);
+ List<OperatConditModel> getGKModelAssembled(Long gkId);
}
--
Gitblit v1.9.1