回归流程改规范
冲突
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/config.ini