Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 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,