Merge branch 'dev' into alpha

# Conflicts: # manifest.json

Merge branch 'dev' into alpha
# Conflicts: # manifest.json
caccd454 · DCloud-yyl · 80d3af39 · b79f7328 · caccd454
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

manifest.json manifest.json +2 -2

未找到文件。
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
  "name": "hello-uniapp x",
  "appid": "__UNI__3584C99",
  "description": "",
-  "versionName": "1.0.16",
-  "versionCode": "10016",
+  "versionName": "1.0.18",
+  "versionCode": "10018",
  "uni-app-x": {},
  /* 快应用特有相关 */
  "quickapp": {},