去掉智能等�
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/PO/exam_subject_page.py