Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'master' into chaozhang

Conflicts:
	protected/modules/mall/models/OrderItem.php

Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'master' of https://github.com/yincart/basic
Merge branch 'master' of https://github.com/yincart/basic
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Yu Chen <710913502@qq.com>