648540858
2024-03-08 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293
refs
用户 648540858 <648540858@qq.com>
星期五, 三月 8, 2024 09:30 +0800
提交者 648540858 <648540858@qq.com>
星期五, 三月 8, 2024 09:30 +0800
提交1fcdf5a8f369e020e78d524db2fe3cc7ffc86293
目录 c051f7b325167769f9d27f0155be02dd3dc74723 目录 | zip | gz
parent a90098b90b50586b710688f7a3affe32e8f56dc9 查看 | 对比
d8b24fc7950cf0ae31e6db41bfd1d698e0fdeecc 查看 | 对比
Merge branch 'wvp-28181-2.0' into main-dev

# 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
6个文件已修改
97 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java 25 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史