修改
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	view/v_header.php
Merge branch 'dev' of https://github.com/XimenTech/SHTP into dev

Conflicts:
	view/v_header.php