Merge branch 'master' into dev

biz-ghs/order/classes/OrderClass.php

@@ -1931,7 +1931,7 @@ class OrderClass extends BaseClass
         if ($payDate != $sendTimWant) {
             $content .= '<BR><BR>';
             $content .= '********************************<BR>';
-            $content .= '<CB>送货时间</CB><BR>';
+            $content .= '<CB>重要！ 送货时间</CB><BR>';
             $content .= '<CB><BOLD>【' . $orderInfo['sendTimeWant'] . '】</BOLD></CB>';
             $content .= '********************************<BR><BR><BR>';
         }