Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

 src/main/resources/mapper/AlarmMapper.xml

@@ -61,8 +61,8 @@
               <if test="mac != null">

               AND d.mac =   #{mac}

               </if>

               <if test="state != null">

               AND h.state = #{state}

               <if test="level != null">

               AND h.state = #{level}

               </if>

            GROUP BY

               <if test="dimension=='monitorPoint'">