发课那弹框的时间还是得1秒
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/myreport.html