Merge branch 'feature/add_item' of wmtx/platform into release

换行字数修正

Application/Admin/Common/extend.php

@@ -2237,7 +2237,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al
     $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行
 
     $height = 20;
-    $font_size = 56;
+    $font_size = 44;
 
     if (strlen($data['pay_company']['partner'])<strlen($data['receive_company']['partner'])) {
         $partner_height = intval(strlen($data['receive_company']['partner'])/$font_size)+1;

Application/Admin/Controller/AggregateFinanceStatementController.class.php

@@ -851,7 +851,7 @@ class AggregateFinanceStatementController extends ThinkController
         $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['second_party_info']['address']);//邮寄地址
 
         $height = 20;
-        $font_size = 56;
+        $font_size = 44;
 
         if (strlen($data['second_party_info']['partner'])<strlen($data['first_party_info']['partner'])) {
             $partner_height = intval(strlen($data['first_party_info']['partner'])/$font_size)+1;