Merge branch 'master' into dev

app-mall/controllers/OrderController.php

@@ -612,7 +612,7 @@ class OrderController extends BaseController
             $hdId = $custom->hdId;
             $hd = \bizMall\hd\classes\HdClass::getById($hdId, true);
             if (empty($hd)) {
-                util::fail('没有花店信息呢');
+                util::fail('没有花店信息呢！');
             }
         }
         $post['hdId'] = $hdId;