Merge branch 'master' into dev

biz-ghs/order/classes/OrderClass.php

@@ -3239,7 +3239,7 @@ XL;
                 $content .= '<TEXT x="230" y="45" font="12" w="1" h="2" r="90">' . $showAddress . '</TEXT>';
             }
             $content .= '<TEXT x="140" y="45" font="12" w="2" h="2" r="90">' . $customMobile . '  '. $itemNum . '扎  ' . $payDate . '</TEXT>';
-            $content .= '<TEXT x="66" y="45" font="12" w="2" h="2" r="90">' . $distName . '  【' . $currentName . '】</TEXT>';
+            $content .= '<TEXT x="66" y="45" font="12" w="2" h="2" r="90">' . $distName . ' 【' . $currentName . '】</TEXT>';
             /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         }
         $p->printLabelMsg($content);