更新代码
Merge remote-tracking branch 'origin/master'

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