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

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java

@@ -358,4 +358,10 @@
      }

       

   }

   @Override

   public Map<String, Object> selectAllById(String id) {

      int id2 = Integer.parseInt(id);

      Map<String, Object> map = monitorPointMapper.selectAllById(id2);

      return map;

   }

}