648540858 16256537fb Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java # src/main/resources/all-application.yml # web_src/package-lock.json		2023-06-19 20:19:31 +08:00
..
assets	添加发送媒体流, 添加媒体服务器节点管理ui,修复修改密码	2021-09-25 22:12:15 +08:00
components	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
layout	fix Notification is not defined on Android Webview or under ios16.4	2023-04-23 17:08:53 +08:00
router	国标录像UI重构	2023-01-09 16:31:51 +08:00
App.vue	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00
main.js	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00