Merge branch 'master' into dev

biz-ghs/order/classes/OrderClass.php

@@ -2942,7 +2942,7 @@ XL;
             if (empty($shortName)) {
                 util::fail('客户短名没有设置');
             }
-            $p->times = 2;
+            $p->times = 1;
             $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="3" h="3" r="90">' . $customMobile . '</TEXT>';