From 42901d03746d534d701ea3b8663e1c6d2c938c6d Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期二, 15 三月 2022 10:28:23 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

---
 web_src/src/components/dialog/chooseChannelForStream.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/src/components/dialog/chooseChannelForStream.vue b/web_src/src/components/dialog/chooseChannelForStream.vue
index 11d7861..eeee14e 100644
--- a/web_src/src/components/dialog/chooseChannelForStream.vue
+++ b/web_src/src/components/dialog/chooseChannelForStream.vue
@@ -1,8 +1,8 @@
 <template>
 <div id="chooseChannelFoStream" >
     <div style="font-size: 17px; color: #606060; white-space: nowrap; line-height: 30px; font-family: monospace;">
-      <span v-if="catalogId == null">{{catalogName}}鐨勭洿鎾祦</span>
-      <span v-if="catalogId != null">{{catalogName}}({{catalogId}})鐨勭洿鎾祦</span>
+      <span v-if="catalogId == null">{{catalogName}}鐨勭洿鎾�氶亾</span>
+      <span v-if="catalogId != null">{{catalogName}}({{catalogId}})鐨勭洿鎾�氶亾</span>
     </div>
     <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;font-size: 14px;">
 

--
Gitblit v1.8.0