merge

src/utils/env-config.js

@@ -12,11 +12,7 @@ export const envConfig = {
     // baseUrl: 'http://10.177.15.150:11905/',
     baseUrl: 'https://dev-sc.yunqueyi.com/',
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
-<<<<<<< HEAD
     baseUrl: 'https://dev-sc.yunqueyi.com/',
-=======
-    // baseUrl: 'https://uat-sc.yunqueyi.com/',
->>>>>>> e6eff64f73239eb106497f96cadf3f8364f21ee9
     apiUrl: 'https://dev-api.yunqueyi.com/',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",