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

..

2.6.9

临时提交

2024-08-22 18:07:42 +08:00

2.7.0

临时提交

2024-08-22 18:07:42 +08:00

2.7.1

临时提交

2024-08-22 18:07:42 +08:00

2.7.3

修复273版本sql文件名称

2024-10-13 20:38:12 +08:00

2.7.3.old

调整配置以及数据库目录

2024-10-12 09:11:21 +08:00

JT1078-2.7.2

1078-添加接入国标通道页面以及属性

2024-06-18 05:55:42 +08:00

old

临时提交

2024-08-22 18:05:57 +08:00