From d2ab6f7153e604bac7bc4ad58f27f368b65d8a1e Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 16 六月 2026 13:54:58 +0800
Subject: [PATCH] feat: 添加能耗数据综合分析功能，支持按天和周维度的趋势分析

---
 src/main/resources/mapper/http/TqdianbiaoEleRecordMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/http/TqdianbiaoEleRecordMapper.xml b/src/main/resources/mapper/http/TqdianbiaoEleRecordMapper.xml
index 04ae911..cd4170b 100644
--- a/src/main/resources/mapper/http/TqdianbiaoEleRecordMapper.xml
+++ b/src/main/resources/mapper/http/TqdianbiaoEleRecordMapper.xml
@@ -7,7 +7,7 @@
             r.id AS id,
             r.time_key AS timeKey,
             r.meter_id AS meterId,
-            COALESCE(r.meter_name, m.meter_name) AS meterName,
+            COALESCE(m.meter_name, m.address) AS meterName,
             m.address AS address,
             r.ratio AS ratio,
             r.reading_method AS readingMethod,

--
Gitblit v1.9.3