Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930

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

@@ -26,4 +26,6 @@
   List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);

   Integer getDeviceCountByRegion(Map<String, Object> parameters);

   List<Map> countByTimes(@Param("start")Date start,@Param("end")Date end,@Param("format")String format);



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

}