Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 src/main/resources/mapper/AlarmDailyMapper.xml

@@ -64,6 +64,9 @@
               <if test="level != null">

               AND h.state = #{level}

               </if>

               <if test="professionId != null">

               AND d.profession_id = #{professionId}

               </if>

            GROUP BY

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

                  mp.id,