Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/services/ExcelToArrayService.php

@@ -40,7 +40,7 @@ class ExcelToArrayService extends Service
             ->setCellValue('I' . $num, '后台备注')
             ->setCellValue('J' . $num, '状态')
             ->setCellValue('K'.$num,'总额')
-            ->setCellValue('K'.$num,'折后')
+            ->setCellValue('L'.$num,'折后')
             ;
         $num += 1;
         foreach($data as $key => $value){
@@ -70,8 +70,8 @@ class ExcelToArrayService extends Service
                 ->setCellValue('H' . $num, $value['memo'])
                 ->setCellValue('I' . $num, $value['remark'])
                 ->setCellValue('J' . $num, $value['status_str'])
-                ->setCellValue('K',$num.$value['af_sum_price'])
-                ->setCellValue('K',$num.$value['sum_price'])
+                ->setCellValue('K'.$num,$value['af_sum_price'])
+                ->setCellValue('L'.$num,$value['sum_price'])
             ;
             $num += 1;
         }