Signed-off-by: ikphp <ikphp@sina.cn>
Merge branch 'HEAD' of git@github.com:ikphp/joyku.git

Conflicts:
	Core/Runtime/Cache/mall/18499737d149a9549cfc7cfc919de65d.php
	Core/Runtime/Cache/mall/32a41ff2f25374248136292df614bbf3.php

Signed-off-by: ikphp <ikphp@sina.cn>