mk1990 6c919937bd Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java		2022-06-22 14:42:46 +08:00
..
common	国标级联推送推流 支持多wvp间自动选择与推送	2022-06-14 14:37:34 +08:00
conf	国标级联推送推流 支持多wvp间自动选择与推送	2022-06-14 14:37:34 +08:00
domain/req	修复打包优化pom	2022-05-07 15:13:56 +08:00
gb28181	Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0	2022-06-22 14:42:46 +08:00
media/zlm	优化播放中zlm离线判断	2022-06-15 15:06:22 +08:00
service	Merge pull request #517 from TristingChen/optimize-play-controller	2022-06-15 14:19:33 +08:00
storager	设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84	2022-06-14 17:00:24 +08:00
utils	固定时区为Asia/Shanghai	2022-06-03 18:52:40 +08:00
vmanager	fix设备状态查询接口	2022-06-22 13:09:09 +08:00
web/gb28181	设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84	2022-06-14 17:00:24 +08:00
VManageBootstrap.java	去除多与引用	2022-05-06 17:29:24 +08:00