Merge remote-tracking branch 'origin/master'

src/main/webapp/admin/orderManage/orderManage.html

@@ -125,6 +125,7 @@
 				,{field: 'personId', title: '玩家ID', width:'8%'}
 				,{field: 'personName', title: '消费者信息', width:'8%'}
 				,{field: 'isDrawdesc', title: '状态', width:'8%'}
+				,{field: 'pickupSttdesc', title: '取货状态', width:'8%'}
 				,{field: 'payModedesc', title: '支付类型', width:'8%'}
 				,{field: 'orderAmt', title: '订单价格', width:'8%'}
 				,{field: 'createTime', title: '创建时间', width: '14%'}