我的收藏
Merge remote-tracking branch 'origin/master'

Conflicts:
	languages/sc-utf-8/common.lang.php
Merge branch 'master' of https://github.com/yh392261226/mall