From 4dc2721047e9cafb4325fca58ca660f2c134da58 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 07 Aug 2021 18:14:09 +0800
Subject: [PATCH] 冲突

---
 src/router/views/index.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index 214e8a6..6be1856 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -792,7 +792,7 @@
     redirect: '/expression/index',
     children: [{
         path: 'index',
-        name: '表现记录查看',
+        name: '表现记录',
         meta: {
             i18n: 'index'
         },
@@ -805,7 +805,7 @@
     redirect: '/job/index',
     children: [{
         path: 'index',
-        name: '从业记录查看',
+        name: '从业记录',
         meta: {
             i18n: 'index'
         },

--
Gitblit v1.9.3