Merge branch 'master' into notice-260707

app-hd/controllers/PurchaseController.php

@@ -726,6 +726,13 @@ class PurchaseController extends BaseController
                             util::fail('请返回选择 必选商品');
                         }
                     }
+                    if ($ghsShopId == 100883) {
+                        $hasMust = array_intersect($ids, [5017957,5036067,5036089,5036099,5017958,5036063,5017948,5035980,5036073,5036075,5036076,5036117,5036118,5017949,5035979,5035976,5035928,5035930,5036061,5035879]);
+                        if (empty($hasMust)) {
+                            util::fail('请返回选择 必选商品');
+                        }
+                    }
+
 
                     //三明易批花
                     if ($ghsShopId == 82200) {