fix: 解决冲突

.drone.yml

@@ -34,6 +34,7 @@ steps:
       - name: cache
         path: /root/.m2
     commands:
+      - npm config set registry http://registry.npm.taobao.org
       - npm i
       - npm run build:dev
 

CHANGELOG.md

@@ -53,6 +53,7 @@
 ### 🔨 代码重构
 范围|描述|commitId
 --|--|--
+ - | 项目列表 | [0486e98](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0486e98)
  - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
  - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
 

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "tall-4-project",
+    "name" : "时物链条",
-    "appid" : "__UNI__1EC8558",
+    "appid" : "__UNI__3CBCFFF",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -43,7 +43,9 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "ad" : {}
+            }
         }
     },
     /* 快应用特有相关 */