guzijian / wvp-GB28181-pro · Commits

fix webrtc player assert failed because media empty

[bugfix]修复云端录像查询时间转换错误的问题

语音对讲合并

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java