Merge branch 'dev'

2019-07-25 22:32:23 +08:00 · 2019-07-25 22:32:23 +08:00 · 8f04d5bf52
parent e0d4235a97 ffb4c25055
commit 8f04d5bf52
1 changed files with 4 additions and 0 deletions
--- a/src/api/attachment.js
+++ b/src/api/attachment.js
@ -94,7 +94,11 @@ attachmentApi.type = {
  },
  TENCENTYUN: {
    type: 'tencentyun',
+<<<<<<< HEAD
    text: '百度云'
+=======
+    text: '腾讯云'
+>>>>>>> dev
  }
 }