Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

 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("name")String name);

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



   /**

    *