格式修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test_regress/src/admin_management.py