Merge branch 'dev' of wugg/fivechang into master

application/Admin/controller/Order.php

@@ -151,7 +151,7 @@ class Order extends Base
 	a.order_num '订单数量',
 	a.order_time '下单时间',
 	a.unit_weight '总重量',
-	if(a.status=1,'待发货',if(a.status=2,'已发货','') '发货状态',
+	if(a.status=1,'待发货',if(a.status=2,'已发货','')) '发货状态',
 	a.delivery_time '发货时间',
 	b.post_code '快递编号',
 	b.post_name '快递公司',