Merge branch 'master' into dev

biz-ghs/order/classes/OrderClass.php

@@ -2014,7 +2014,12 @@ class OrderClass extends BaseClass
                     $showPrice = 0;
                 }
             }
-
+            //梅州紫荆鲜花，线上下单，不显示价格
+            if (isset($orderInfo->mainId) && $orderInfo->mainId == 92739) {
+                if (!empty($orderInfo->customShopAdminId)) {
+                    $showPrice = 0;
+                }
+            }
             //北京花篮子，线上下单，不显示价格
             if (isset($orderInfo->mainId) && $orderInfo->mainId == 10735) {
                 if (!empty($orderInfo->customShopAdminId)) {