Merge branch 'dev_zyx' into dev

5 years ago · 945ea1173a
parent 4dd2ab92f3 a307bf343e
commit 945ea1173a
1 changed files with 2 additions and 1 deletions
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/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));