From 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Nov 2020 09:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index f64a1fc..f9a4473 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -29,9 +29,9 @@
MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</when>
<otherwise>
- AVG(json->'$.${sensorKey}[0]') AS 'AVG${sensorKey}',
+ AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}',
MIN(json->'$.${sensorKey}[1]') AS 'MIN${sensorKey}',
- MAX(json->'$.${sensorKey}[2]') AS '${sensorKey}'
+ MAX(json->'$.${sensorKey}[2]') AS 'MAX${sensorKey}'
</otherwise>
</choose>
</foreach>
--
Gitblit v1.8.0