From 23d4952af5a0826117b8cf3e77535e976dc525fb Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Fri, 3 Aug 2018 10:44:29 +0800
Subject: [PATCH] Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

---
 index/index.html    | 2 +-
 resource/js/unit.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/index/index.html b/index/index.html
index 1874893..b4dbed0 100644
--- a/index/index.html
+++ b/index/index.html
@@ -22,7 +22,7 @@
 <header>
     <div class="nav-bar-wrap">
         <div class="float-left login-name">
-            <span id="loginName"></span>&nbsp;&nbsp;<span class="cursorpointer" id="logoutId">退出</span>
+            <span id="loginShowName"></span>&nbsp;&nbsp;<span class="cursorpointer" id="logoutId">退出</span>
         </div>
 
         <nav class="float-right">
diff --git a/resource/js/unit.js b/resource/js/unit.js
index 56337d1..416a60b 100644
--- a/resource/js/unit.js
+++ b/resource/js/unit.js
@@ -568,6 +568,4 @@ var commonClass = {
     }
 }
 
-
-
-$("#loginName").text(fn.getUserName());
+$("#loginShowName").text(fn.getUserName());
--
libgit2 0.21.4