Merge remote-tracking branch 'origin/master'

public/react/src/modules/page/main/ActionView.js

@@ -64,7 +64,7 @@ class ActionView extends Component {
 	      	<div className="-flex -layout-h" id="game_operate_action">
 	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
 	      			{!gameBuilding && record ? 
-	      				<Tooltip title={ "本次评测耗时" }>
+	      				<Tooltip title={ "本次评测耗时(编译、运行总时间)" }>
 	      					<span>{ record } 秒</span>
 	      				</Tooltip>
 	      			: ""}