Signed-off-by: 南博æ? <nanbowen@fuego.cn>
Merge branch 'dev' of https://github.com/TinderTeam/copydp into dev

Conflicts:
	code/copydp/Home/Lib/Action/SellerCenterAction.class.php
	code/copydp/Home/Tpl/UserCenter/userinfo.html

Signed-off-by: 南博æ? <nanbowen@fuego.cn>