Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

 src/main/resources/mapper/MonitorPointMapper.xml

@@ -88,7 +88,7 @@
         </if>
      )
   </select>
   <select id="getMonitorPointsByAreaName" resultType="com.moral.entity.MonitorPoint">
   <select id="getMonitorPointsByAreaName" resultMap="BaseResultMap">
      SELECT
         mp.* 
      FROM