From 750fe74ceca55b9fc7764a4b82981072858a570c Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期二, 08 四月 2025 16:16:37 +0800 Subject: [PATCH] Merge branch 'develop1.0' of https://github.com/zhitan-cloud/zhitan-ems into develop1.0 --- zhitan-system/src/main/resources/mapper/energyData/EnergyDataMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zhitan-system/src/main/resources/mapper/energyData/EnergyDataMapper.xml b/zhitan-system/src/main/resources/mapper/energyData/EnergyDataMapper.xml index 0b8a1df..ef09dcd 100644 --- a/zhitan-system/src/main/resources/mapper/energyData/EnergyDataMapper.xml +++ b/zhitan-system/src/main/resources/mapper/energyData/EnergyDataMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.energydata.mapper.EnergyDataStatisticMapper"> - <select id="getModelNodeIndexIdByFixedNodeIds" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfor"> + <select id="getModelNodeIndexIdByFixedNodeIds" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo"> SELECT mn.node_id nodeId, mn."name" "name", ni.index_id indexId, -- Gitblit v1.9.3