Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-29 1097d9b75533cd4686bc24cb06ed98010fcfcecf

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -38,7 +38,7 @@
            AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'

         </foreach>

      FROM

         history_minutely h

         history_${timeUnits} h

      WHERE

         h.time >= #{start}

      AND h.time <![CDATA[<]]> #{end}