Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

2021-01-07 15:31:16 +08:00
parent 9bf87971e7 05960d3573
commit 059a5a678a
3 changed files with 19 additions and 27 deletions
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -112,8 +112,6 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 		return new PageInfo<>(all);
 	}

-
-
 	@Override
 	public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
 		return deviceChannelMapper.queryChannelsByDeviceId(deviceId, null,null, null, null);