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

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

Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/backend/runtime/application.log

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: wucangzhou <wucangzhou@gmail.com>
Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou

Conflicts:
	protected/extensions/shoppingCart/EShoppingCart.php
	themes/leather/views/item/view.php

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

Conflicts:
	protected/backend/runtime/application.log
	protected/components/Tbfunction.php
	protected/controllers/OrderController.php
	protected/modules/mall/models/Order.php
	protected/modules/mall/views/order/create.php

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

Conflicts:
	protected/modules/mall/controllers/OrderController.php
	protected/modules/mall/models/Order.php
	protected/modules/mall/models/OrderItem.php
	protected/modules/mall/views/order/admin.php
	protected/modules/mall/views/order/create.php

Signed-off-by: Jingye Wang <4893278@qq.com>