Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

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

@@ -52,4 +52,6 @@
   List<Device> getDeviceById3(@Param("id") int id);



   List<Integer> getHasWindDirAndWindSpeedDeviceVersion();



   List<Device> selectDevicesAll(Map<String, Object> params);

}