解决合并冲突

src/api/country.js

@@ -13,3 +13,11 @@ export function locale() {
     method: 'get'
   })
 }
+
+export function checkCountryCode(params){
+  return request({
+    url: '/app-api/ecw/region/check/dest-currency/area-code/',
+    method: 'get',
+    params
+  })
+}