合并苹果打包冲突；

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "DeepChartApp",
-    "appid" : "__UNI__D8DF433",
+    "appid" : "__UNI__2646D0B",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -40,9 +40,12 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "minSdkVersion" : 21
+            },
+            "ios" : {
+                "dSYMs" : false
             },
-            "ios" : {},
             /* ios打包配置 */
             "sdkConfigs" : {
                 "oauth" : {
@@ -52,6 +55,22 @@
                     }
                 }
             }
+        },
+        "nativePlugins" : {
+            "Aimer-TCPPlugin" : {
+                "__plugin_info__" : {
+                    "name" : "TCP-Socket原生插件(支持Android和IOS)  - [试用版，仅用于自定义调试基座]",
+                    "description" : "Uniapp实现基于TCP的数据通信,支持单片机、智能家居等硬件交互,联系QQ: 462108858",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2029",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 0,
+                    "pid" : "2029",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* SDK配置 */