648540858 277f2db137 Merge branch 'master' into 重构/1078 ...

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/TcpServer.java
#	src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/CivilCodeUtil.java
#	src/main/resources/application.yml
#	web_src/src/layout/UiHeader.vue
#	web_src/src/router/index.js

2024-10-18 13:55:23 +08:00

..

entity

1078-添加部标通道页面

2024-06-07 00:10:36 +08:00

factory

优化日志以及属性设置代码

2024-07-03 17:09:49 +08:00

request

Merge branch 'master' into 重构/1078

2024-10-18 13:55:23 +08:00

response

1078-支持设备录像FTP方式下载

2024-06-10 00:33:55 +08:00

Header.java

1078-添加部标通道页面

2024-06-07 00:10:36 +08:00