From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
web_src/src/components/control.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web_src/src/components/control.vue b/web_src/src/components/control.vue
index a0b2834..b8b3e34 100644
--- a/web_src/src/components/control.vue
+++ b/web_src/src/components/control.vue
@@ -576,7 +576,7 @@
let that = this;
this.$axios({
method: 'get',
- url: '/zlm/' + that.mediaServerChoose + '/index/api/kick_session&id=' + id
+ url: '/zlm/' + that.mediaServerChoose + '/index/api/kick_session?id=' + id
}).then(function (res) {
that.getAllSession();
that.$message({
--
Gitblit v1.8.0