From 60d57d3ef0c01653fe50b782186d52b79e655ff6 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期六, 08 二月 2025 15:56:47 +0800
Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0

---
 zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
index c704454..01c8c59 100644
--- a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
@@ -382,7 +382,8 @@
         SELECT mn.node_id  nodeId,
                mn."name"   "name",
                ni.index_id indexId,
-               ei.energy_id energyId
+               ei.energy_id energyId,
+               ei.index_type indexType
         FROM "model_node" mn
         LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
         LEFT JOIN energy_index ei on ni.index_id = ei.index_id

--
Gitblit v1.9.3