panlinlin 7e581e9d3a Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

2021-01-08 17:31:49 +08:00

..

StreamInfo.java

修复检测字段是否存在带来的停止按钮无法点击

2021-01-08 17:27:13 +08:00

VideoManagerConstants.java

完成向上级联->保活

2021-01-06 18:35:38 +08:00