Merge branch 'master' into dev

.gitattributes

@@ -3,3 +3,16 @@
 /.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore
 /docs               export-ignore
+
+# 统一换行符，避免仅 CRLF/LF 差异被 Git 识别为修改
+* text=auto
+
+*.php text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.xml text eol=lf
+*.sql text eol=lf
+

app-ghs/controllers/OrderController.php

@@ -3225,6 +3225,8 @@ class OrderController extends BaseController
         $ext = $this->shopExt;
         $shop = $this->shop;
         OrderClass::printLogisticsLabel($order, $shop, $ext);
+        $order->printWlNum = intval($order->printWlNum ?? 0) + 1;
+        $order->save();
         util::complete('打印成功');
     }