Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/index.html

@@ -119,9 +119,6 @@
                           <span class="hidden-xs" ng-bind="loginData.name"></span>
                         </a>
                       </li>
-                    <li class="dropdown user user-menu">
-                          <a  ng-click="logout()" class="btn btn-flat" style="background-color: #0c6ba2;border: 0">退出当前用户</a>
-                    </li>
                 </ul>
             </div>