648540858
2024-04-24 b89af9a6936f15044a5d8f568ab691f796cfbec2
refs
用户 648540858 <648540858@qq.com>
星期三, 四月 24, 2024 20:51 +0800
提交者 648540858 <648540858@qq.com>
星期三, 四月 24, 2024 20:51 +0800
提交b89af9a6936f15044a5d8f568ab691f796cfbec2
目录 6af5d2145505a4ff943a5f73ed1c4857eea6bb0c 目录 | zip | gz
parent 1a309929853633b981401ae4eea98f4ab74bd3e9 查看 | 对比
2113e8cf271e0d189d4ff9dd2d4d5dd7cba6e3ab 查看 | 对比
Merge branch 'refs/heads/2.7.0'

# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
6个文件已修改
651 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java 203 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java 31 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java 390 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java 18 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史