Merge branch 'dev_zyx' into dev

Application/Admin/Controller/ExportController.class.php

@@ -5554,9 +5554,10 @@ if ($key == 'model'){
 
         foreach($xlsData as $key => $value) {
             foreach ($value as $k => $v) {
-                $xlsData[$key][$k]['pay_way'] = getPayType($value['pay_way']);
+                $xlsData[$key][$k]['pay_way'] = getPayType($v['pay_way']);
             }
         }
+//        dump($xlsData);die();
 
 
         $map['pay_time'] = array('between',array($startTime,$endTime));