update

src/api/api.js

@@ -266,11 +266,7 @@ export default {
   // 生成图片验证码
   GetCode() {
     return api
-<<<<<<< HEAD
-      .get(host + "/api/Home/GetSecurityCode", {
-=======
       .get(host2 + "/ymall/getSecurityCode", {
->>>>>>> partnerV1
         responseType: "arraybuffer"
       })
       .then(res => {