Merge remote-tracking branch 'origin/master'

src/api/system/user.js

@@ -136,13 +136,10 @@ export function deptTreeSelect() {
 }
 
 // 根据用户名查询实际名称
-export function showName(userName) {
+export function showName() {
   return request({
     url: '/system/user/showName',
-    method: 'get',
-    params: {
-      username: userName
-    }
+    method: 'get'
   })
 }
 

src/layout/components/Navbar.vue

@@ -114,7 +114,7 @@ export default {
     RuoYiDoc
   },
   mounted() {
-    showName(Cookies.get('username')).then(response => {
+    showName().then(response => {
       if(response.code === 200){
         this.username = response.msg
       } else {