Merge branch 'develop'

Author: netbuffer

README.md

@@ -23,8 +23,8 @@
 * mockito
 * itextpdf
 
-> # github:[https://github.com/netbuffer/ssmbootstrap_table](https://github.com/netbuffer/ssmbootstrap_table)
-> # git@osc:[http://git.oschina.net/gradle/ssmbootstrap_table](http://git.oschina.net/gradle/ssmbootstrap_table)
+> ## github:[https://github.com/netbuffer/ssmbootstrap_table](https://github.com/netbuffer/ssmbootstrap_table)
+> ## git@osc:[http://git.oschina.net/gradle/medoo_bootstrap_table](http://git.oschina.net/gradle/medoo_bootstrap_table)
 
 ## How to run
 The project constructed by `maven`, please execute under the `src/main/java` `SQL script` to your `MySQL` database operation, and then modify the database configuration information `jdbc.properties` under the path `src/main/resource` configuration file in the project directory, enter, execute `mvn tomcat7:run` to run

src/main/webapp/manage.html

@@ -45,7 +45,7 @@
 				"placement" : "bottom"
 			});
 			$("#xinzeng").mouseover();
-			$("#login_username").text(data.username);
+			$(".login_username").text(data.username);
 			$.getJSON('datacount', function(data) {
 				var myChart = echarts.init(document
 						.getElementById('echarts_test'));
@@ -323,12 +323,12 @@
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
 					<li class="visible-xs-block">
-						<a href="#">欢迎您：<span id="login_username"></span></a>
+						<a href="#">欢迎您：<span class="login_username"></span></a>
 					</li>
 					<li class="hidden-xs">
 						<p class="navbar-text">
 							<span class="glyphicon glyphicon-user"></span> 欢迎您：<span
-								id="login_username"></span>
+								class="login_username"></span>
 						</p>
 					</li>
 					<li class="hidden-xs">