Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

 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);

}