Merge branch 'master' into dev

biz-ghs/order/classes/OrderClass.php

@@ -3135,7 +3135,7 @@ XL;
                 }
             }
             if ($num > 1) {
-                $customName = $customName . ' ' . $num . '单';
+                $customName = $customName . ' 共' . $num . '单';
             }
             $itemNum = $order->itemNum ?? 0;
             $itemNum = floatval($itemNum);