Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -2823,7 +2823,7 @@ class OrderController extends BaseController
         if (isset($ext->printSn) == false || isset($ext->printKey) == false || empty($ext->printSn) || empty($ext->printKey)) {
             util::success(['hasNoPrint' => 1]);
         }
-        util::checkRepeatCommit($this->adminId, 2);
+        util::checkRepeatCommit($this->adminId, 3);
         OrderClass::onlinePrint($order, $showPrice);
         $order->printNum += 1;
         $order->save();