Merge branch 'master' of http://119.23.72.7/q578953158/php_frq_api

app/Model/InquiryModel.php

@@ -343,7 +343,7 @@ class InquiryModel extends Model
                 $v["inquiry_sn_origin"] = $v['inquiry_sn'];
                 $v["inquiry_sn_origin"] = $v['inquiry_sn'];
                 if ($res) {
                 if ($res) {
                     $urge = $InquiryItemsUrgeModel->getLastInfo($v['id']);
                     $urge = $InquiryItemsUrgeModel->getLastInfo($v['id']);
-                    $v['inquiry_sn'] =  $v['inquiry_sn'] . "<span style='color:red;'>&nbsp;（催）</span>";
+                    $v['inquiry_sn'] =  $v['inquiry_sn'] . "<span style='color:red;'>(催)</span>";
                 }
                 }
             }
             }
 
 

app/Model/QuoteModel.php

@@ -52,7 +52,7 @@ class QuoteModel extends Model
             $v["price_rmb"] = $v["currency"] == 1 ? "￥".$v["price_rmb"]:"--";
             $v["price_rmb"] = $v["currency"] == 1 ? "￥".$v["price_rmb"]:"--";
             $v['status'] = QuoteMap::$status[$v["status"]];
             $v['status'] = QuoteMap::$status[$v["status"]];
             if ($v["raw_goods_packing"] != ""){
             if ($v["raw_goods_packing"] != ""){
-                $v["create_name"] = "digikey(包装：".$v["raw_goods_packing"].")";
+                $v["create_name"] = $v["create_name"]."(包装：".$v["raw_goods_packing"].")";
             }
             }
         }
         }
         return [0, '成功', $list['data'], $list['total']];
         return [0, '成功', $list['data'], $list['total']];