修改一下格式
Merge branch 'master' of https://github.com/yilu282/automation_test

Conflicts:
	Test_regress/src/admin_management.py
Merge branch 'master' of https://github.com/yilu282/automation_test