648540858 26739237e2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial ...

# Conflicts:
#	sql/update.sql
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	web_src/src/components/dialog/deviceEdit.vue
#	web_src/src/components/dialog/devicePlayer.vue

2022-06-27 10:16:21 +08:00

..

clean.sql

添加自动拉起未推流设备的控制开关

2022-04-18 10:52:38 +08:00

mysql.sql

Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

2022-06-27 10:16:21 +08:00

update.sql

Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial

2022-06-27 10:16:21 +08:00