From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
index 5d222b3..eb7fbde 100644
--- a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
@@ -292,7 +292,7 @@
</select>
<select id="getModelNodeIndexIdRelationInforByCode"
- resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId
@@ -303,7 +303,7 @@
</select>
<select id="listModelNodeIndexIdRelationInforByParentId"
- resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId
@@ -313,7 +313,7 @@
</select>
<select id="getModelNodeIndexIdRelationInforByNodeId"
- resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId
@@ -336,7 +336,7 @@
LIMIT 1;
</select>
<select id="selectIndexByModelCodeAndNodeId"
- resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name",
ni.index_id indexId
@@ -380,7 +380,7 @@
</foreach>
</insert>
- <select id="getModelNodeIndexIdByNodeId" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ <select id="getModelNodeIndexIdByNodeId" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId,
@@ -395,7 +395,7 @@
and ei.energy_id = #{energyType}
</if>
</select>
- <select id="getModelNodeByParentId" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ <select id="getModelNodeByParentId" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId,
@@ -411,7 +411,7 @@
where model_code = #{modelCode} AND parent_id is null
order by order_num
</select>
- <select id="selectIndexByNodeIds" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor">
+ <select id="selectIndexByNodeIds" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
SELECT mn.node_id nodeId,
mn."name" "name",
ni.index_id indexId,
--
Gitblit v1.9.3