diff --git a/src/api/attachment.js b/src/api/attachment.js
index 3f4167987..386bba7a1 100644
--- a/src/api/attachment.js
+++ b/src/api/attachment.js
@@ -94,7 +94,11 @@ attachmentApi.type = {
   },
   TENCENTYUN: {
     type: 'tencentyun',
+<<<<<<< HEAD
     text: '百度云'
+=======
+    text: '腾讯云'
+>>>>>>> dev
   }
 }