Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -19,7 +19,7 @@


   List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);



   List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);

   List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("name")String name);



   /**

    *