From 501ebd43da6372ee753d422290327e339b04abb5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Mar 2018 10:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index cdccfe8..3f3e22f 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.HistoryMinutelyMapper">
 
-	<select id="getSersionAvgByDevice" resultType="map">
+	<select id="getSersionAvgByDevice" resultType="java.util.LinkedHashMap">
 		SELECT
 			${sensorKeyColumn}
 		FROM
@@ -13,7 +13,7 @@
 		AND time &lt; #{end}
 	</select>
 	
-	<select id="getMonitorPointOrDeviceAvgData" resultType="map">
+	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.LinkedHashMap">
 		SELECT
 			DATE_FORMAT(time, #{typeFormat}) time,
 			${sensorKeyColumn}

--
Gitblit v1.8.0