Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-07 501ebd43da6372ee753d422290327e339b04abb5

 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}