From abd89f6eeb7fd72e47f0bf4ace0223acfc6cf551 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 1 Nov 2022 09:20:18 +0800
Subject: [PATCH] Merge branch 'hi-ucs-pre' into release

# Conflicts:
#	back/public/config/basicConfig.js
---
 back/public/config/basicConfig.js | 2 +-
 back/src/i18n/zh-CN.js            | 4 ++--
 back/src/views/main-navbar.vue    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index c3ad3fd6..1f847ce8 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
  * @LastEditors: Light
- * @LastEditTime: 2022-11-01 09:15:08
+ * @LastEditTime: 2022-11-01 09:20:12
  * @Description: 告诉大家这是什么
  */
 var _global = {}
diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index 2f5ea310..acefdd06 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -3,8 +3,8 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = '资源管理中心'
-t.brand.mini = '数字政务'
+t.brand.lg = '能力管理中心'
+t.brand.mini = '一体化综合指挥'
 
 t.add = '新增'
 t.delete = '删除'
diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue
index 2c212e54..0df84d2c 100644
--- a/back/src/views/main-navbar.vue
+++ b/back/src/views/main-navbar.vue
@@ -12,7 +12,7 @@
           $t("brand.lg")
         }}</a>
         <span>——</span>
-        <span class="back-title-text">政务系统能力知识库</span>
+        <span class="back-title-text">后台管理系统</span>
       </h1>
     </div>
     <div class="aui-navbar__body">