Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -167,7 +167,7 @@ class ConsoleController extends BaseController
             }
         }
 
-        $notice[] = ['title' => '不要将小石联系电话给零售花店，给了我们直接拒绝服务，并将此花店列入黑名单。', 'action' => '', 'page' => ''];
+        //$notice[] = ['title' => '不要将小石联系电话给零售花店，给了我们直接拒绝服务，并将此花店列入黑名单。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '快速设置：客户下单自动计算跑腿费', 'action' => '查看', 'page' => '/admin/book/detail?id=auto_calc_pt_fee'];
         //$notice[] = ['title' => '订单上如何一键呼叫跑腿', 'action' => '查看', 'page' => '/admin/book/detail?id=one_call_pt'];
 

biz-ghs/order/classes/OrderClass.php

@@ -2945,7 +2945,7 @@ XL;
             $p->times = 2;
             $content = '<TEXT x="420" y="130" font="12" w="4" h="4" r="90">' . $shortName . '</TEXT>';
             $content .= '<TEXT x="395" y="10" font="12" w="2" h="2" r="90">地址</TEXT>';
-            $content .= '<TEXT x="290" y="130" font="12" w="4" h="4" r="90">' . $shortMobile . '</TEXT>';
+            $content .= '<TEXT x="290" y="130" font="12" w="3" h="3" r="90">' . $customMobile . '</TEXT>';
             $content .= '<TEXT x="265" y="10" font="12" w="2" h="2" r="90">代码</TEXT>';
             $content .= '<TEXT x="170" y="130" font="12" w="4" h="4" r="90">' . $shortRemark . '</TEXT>';
             $content .= '<TEXT x="150" y="10" font="12" w="2" h="2" r="90">物流</TEXT>';