From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelNodeServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelNodeServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelNodeServiceImpl.java
index f67f0a2..cb6308b 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelNodeServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/ModelNodeServiceImpl.java
@@ -7,12 +7,11 @@
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.ModelNode;
import com.zhitan.model.domain.TreeObject;
-import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import com.zhitan.model.mapper.ModelNodeMapper;
import com.zhitan.model.service.IEnergyIndexService;
import com.zhitan.model.service.IModelNodeService;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -285,7 +284,7 @@
* @return
*/
@Override
- public List<ModelNodeIndexInfor> getModelNodeIndexIdRelationInforByCode(String code) {
+ public List<ModelNodeIndexInfo> getModelNodeIndexIdRelationInforByCode(String code) {
return modelNodeMapper.getModelNodeIndexIdRelationInforByCode(code);
}
@@ -296,7 +295,7 @@
* @return
*/
@Override
- public List<ModelNodeIndexInfor> getModelNodeIndexIdRelationInforByNodeId(String nodeId) {
+ public List<ModelNodeIndexInfo> getModelNodeIndexIdRelationInforByNodeId(String nodeId) {
return modelNodeMapper.getModelNodeIndexIdRelationInforByNodeId(nodeId);
}
@@ -307,7 +306,7 @@
* @return
*/
@Override
- public List<ModelNodeIndexInfor> listModelNodeIndexIdRelationInforByParentId(String parentId) {
+ public List<ModelNodeIndexInfo> listModelNodeIndexIdRelationInforByParentId(String parentId) {
return modelNodeMapper.listModelNodeIndexIdRelationInforByParentId(parentId);
}
--
Gitblit v1.9.3