Merge remote-tracking branch 'origin/master'

apps/exams/Tpl/default/Index/examsresult_w3g.html

@@ -72,7 +72,7 @@
 			<div class="reportPage">
 			<div class="reportPage">
 				<div class="reportTop">
 				<div class="reportTop">
 					<p class="reportTop_t">练习题目：{$paper.exams_paper_title}</p>
 					<p class="reportTop_t">练习题目：{$paper.exams_paper_title}</p>
-					<p class="reportTop_t">耗时：{:floor($answerData['anser_time']/60)}h{:$answerData['anser_time'] % 60}m</p>
+					<p class="reportTop_t">耗时：{:floor($answerData['anser_time']/60)}m{:$answerData['anser_time'] % 60}s</p>
 				</div>
 				</div>
 				<div class="reportContent">
 				<div class="reportContent">
 					<p class="reportContent_de">得分</p>
 					<p class="reportContent_de">得分</p>