From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001 From: wente <329538422@qq.com> Date: 星期四, 05 十二月 2024 09:40:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/OperatConditModelDao.java | 3 +-- 1 files changed, 1 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 75a0b8c..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,7 +22,7 @@ List<OperatConditModel> getList(Map<String, Object> params); - List<ModelRbd> getModelList(Long productId); + List<ModelRbd> getModelList(Map<String, Object> productId); List<ModelNodes> getModelNodes(Long shipId); -- Gitblit v1.9.1