Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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

@@ -35,4 +35,6 @@
   List<Map> countByTimes(@Param("start")Date start,@Param("end")Date end,@Param("format")String format);



   List<Device> getDevicesByProfession(Map<String, Object> parameters);



   List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);

}