wvp-pro.git - Gitblit

搭配zgyw，实现gb28181

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

648540858

2022-05-10 6e48dd3f327da941ca63e85b97992ff13a148434

refs
用户	648540858 <648540858@qq.com>
	星期二, 五月 10, 2022 09:46 +0800
提交者	648540858 <648540858@qq.com>
	星期二, 五月 10, 2022 09:46 +0800
提交	6e48dd3f327da941ca63e85b97992ff13a148434
目录	74041be1ea427cdb48c31cc2ccdfd9fe66c3be74 目录 \| zip \| gz
parent	c2aaae9325db012c9960b69784330ced5ec15ab9 查看 \| 对比 93e6347f188b87e8d946005aa24b9d7401bc818c 查看 \| 对比

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

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

3个文件已修改

	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java	37 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史