Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-07-31 33ca0da19b3f87751662de0072c48ce9ce963202

 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,