Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

 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,