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

Conflicts:
	protected/backend/runtime/application.log
	protected/components/Tbfunction.php
	protected/controllers/OrderController.php
	protected/modules/mall/controllers/OrderController.php
	protected/modules/mall/models/OrderItem.php
	protected/modules/mall/views/order/admin.php
	protected/modules/mall/views/order/view.php

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