Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into jingye

Conflicts:
	data/yincart-basic.sql

Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'jingye' into Chaozhang

Conflicts:
	protected/backend/runtime/application.log
	protected/modules/mall/controllers/OrderController.php
	protected/modules/mall/views/order/admin.php

Signed-off-by: Chaozhang Xue <475990465@qq.com>