diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
index 0e57e9b..3f81c2d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
@@ -58,12 +58,12 @@
 				style="margin-top:0px;margin-bottom:0;">
 				<thead>
 					<tr>
-						<th class="center"><div style="width:109px;">键盘</div></th>
-						<th class="center"><div style="width:80px;">学号</div></th>
 						<th class="center"><div style="width:80px;">姓名</div></th>
+						<th class="center"><div style="width:80px;">排名</div></th>
 						<th class="center"><div style="width:80px;">得分</div></th>
+						<th class="center"><div style="width:80px;">学号</div></th>
+						<th class="center"><div style="width:109px;">键盘</div></th>
 						<!-- <th class="center"><div style="width:80px;">正确率</div></th> -->
-						<th class="center"><div style="width:80px;">排名</div></th>
 						<c:forEach items="${questionInfo}" var="var" varStatus="vs">
 							<th class="center"><div style="width:80px;margin:0 auto;">题目${vs.index+1}</div></th>
 						</c:forEach>
@@ -92,12 +92,12 @@
 						<c:when test="${not empty studentInfo}">
 							<c:forEach items="${studentInfo}" var="var" varStatus="vs">
 								<tr>
-									<td class="center"><div style="width:109px;">${var.KEYPAD_ID}</div></td>
-									<td class="center"><div style="width:80px;">${var.NUMBER}</div></td>
 									<td class="center"><div style="width:80px;">${var.NAME}</div></td>
+									<td class="center"><div style="width:80px;">${var.RANK_NUM}</div></td>
 									<td class="center"><div style="width:80px;">${var.GETSCORE}</div></td>
+									<td class="center"><div style="width:80px;">${var.NUMBER}</div></td>
+									<td class="center"><div style="width:109px;">${var.KEYPAD_ID}</div></td>
 									<%-- <td class="center">${var.RIGHT}</td> --%>
-									<td class="center"><div style="width:80px;">${var.RANK_NUM}</div></td>
 									<c:forEach items="${questionInfo}" var="var1" varStatus="vs1">
 										<td class="center" <c:if test="${var.detail[vs1.index].RIGHT== '1'}">style="background:#0bb8b9"</c:if>div style="width:80px;margin:0 auto;">${var.detail[vs1.index].ANSWER}</div></td>
 									</c:forEach>
diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties
index 0a550a0..896903b 100644
--- a/resources/dbconfig.properties
+++ b/resources/dbconfig.properties
@@ -1,5 +1,5 @@
 #数据源 1
-url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
+url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 driverClassName:com.mysql.jdbc.Driver