Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -31,7 +31,7 @@
      AND time < #{end}

   </select>

   

   <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">

   <select id="getMonitorPointOrDeviceAvgData" resultType="java.util.LinkedHashMap">

      SELECT

         DATE_FORMAT(time, #{typeFormat}) time

         <foreach  collection="sensorKeys" open="," separator="," item="sensorKey">