修改店铺订单打开时，Model为缺货状态下Add To Cart可点击。

RedAnt ERP Mobile/HMLG Mobile/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -967,7 +967,7 @@ self.isrefreshing=false;
         if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
             cell.btnaddPortfolio.hidden = YES;
             
-            if (!notifyMe_switch) {
+            if (!notifyMe_switch || [Singleton sharedInstance].currentOrderIsMerged) {
                 
                 cell.btnNotifyMe.hidden = YES;
                 CGRect wishListFrame = cell.btnaddWish.frame;