Authored by 周少峰

Merge branch 'release/6.1.0' into gray

Conflicts:
	package.json
{
"name": "yohobuy-node",
"version": "6.0.23",
"version": "6.0.25",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...