wvp-pro.git - Gitblit

搭配zgyw，实现gb28181

648540858

2022-11-25 d7623b5ca864d98ab954a458b049641eb82f4f75

refs
用户	648540858 <648540858@qq.com>
	星期五, 十一月 25, 2022 10:57 +0800
提交者	648540858 <648540858@qq.com>
	星期五, 十一月 25, 2022 10:57 +0800
提交	d7623b5ca864d98ab954a458b049641eb82f4f75
目录	42d9d738322250b46b081dda0c67109a629b8f30 目录 \| zip \| gz
parent	80d96042e7b6f2942585bde482f02a3392477033 查看 \| 对比 fa2ccb4ec8737df8718f1507bdd290fc7b5dd144 查看 \| 对比

Merge branch 'wvp-28181-2.0'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/bean/RequestSendItemMsg.java

3个文件已修改

	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java	112 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	web_src/src/components/dialog/devicePlayer.vue	44 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史