Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-01 af8dd6eccb0aab770246ae44db1cde4e531416c5

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

@@ -14,4 +14,5 @@
   List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);

    List<Device>  selectWithRelationData(Example example);

   List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);

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

}