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

Conflicts:
	protected/components/Tbfunction.php
	protected/modules/mall/MallModule.php
	protected/modules/mall/controllers/OrderController.php
	protected/modules/mall/models/Order.php
	protected/modules/mall/models/Payment.php
	protected/modules/mall/models/Users.php
	protected/modules/mall/views/order/_form.php
	protected/modules/mall/views/order/_search.php
	protected/modules/mall/views/order/admin.php
	protected/modules/mall/views/order/create.php
	protected/modules/mall/views/order/select_user.php
	protected/modules/mall/views/order/update.php
	protected/modules/mall/views/order/view.php
	protected/modules/mall/views/orderLog/_form.php
	protected/modules/mall/views/payment/_search.php

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

Conflicts:
	protected/modules/mall/controllers/OrderController.php
	protected/modules/mall/views/order/_form.php
	protected/modules/mall/views/order/update.php

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