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

汇总bug修正

Application/Admin/Controller/AggregateRelationController.class.php

@@ -696,6 +696,11 @@ class AggregateRelationController extends AdminController
         if($type == 0){
             //己方公司
             $companyInfo = M("CompanyInfo","tab_")->field("id,partner company_name,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,invoice_item,invoice_type,register_phone,register_address")->where("status='1' AND id='{$id}'")->find();
+            if (strstr($companyInfo['invoice_type'],'专')) {
+                $companyInfo['invoice_type'] = "专票";
+            } else if (strstr($companyInfo['invoice_type'],'普')) {
+                $companyInfo['invoice_type'] = "普票";
+            }
         }
         if($type == 1){
             //上游