Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

# Conflicts: # resource/js/unit.js

Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
# Conflicts: # resource/js/unit.js
王富生
1 parent a37976b2
Showing 2 changed files with 2 additions and 4 deletions
index/index.html
resource/js/unit.js
@@ -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">
@@ -568,6 +568,4 @@ var commonClass = {
     }
 }
  
-
-
-$("#loginName").text(fn.getUserName());
+$("#loginShowName").text(fn.getUserName());