From 7a982d8d9fbd420da1dff7066066412ae9677cb5 Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Mon, 10 Jul 2023 11:31:04 +0800
Subject: [PATCH] 冲突

---
 packageE/pages/qy/contactMe/contactMe.js | 19 -------------------
 1 file changed, 0 insertions(+), 19 deletions(-)

diff --git a/packageE/pages/qy/contactMe/contactMe.js b/packageE/pages/qy/contactMe/contactMe.js
index 92ae371..365ff77 100644
--- a/packageE/pages/qy/contactMe/contactMe.js
+++ b/packageE/pages/qy/contactMe/contactMe.js
@@ -152,24 +152,6 @@ Page({
       console.log(res);
       if (res.data.code == 0) {
         // let resdata=JSON.parse(res.data.data);
-<<<<<<< HEAD
-          let openuserid=res.data.data.openuserid;
-          let skip_verify=res.data.data.skip_verify;
-          this.setData({
-            openuserid,
-            skip_verify
-          })
-      }
-    })
-  },
-  async getqy(){
-    wx.showLoading({
-      title: '加载中',
-      mask:true
-    })
-    let openuserid=this.data.openuserid
-    let skip_verify=this.data.skip_verify ? true : false
-=======
         let openuserid = res.data.data.openuserid;
         let skip_verify = res.data.data.skip_verify;
         this.setData({
@@ -189,7 +171,6 @@ Page({
     // })
     let openuserid = this.data.openuserid
     let skip_verify = this.data.skip_verify ? true : false
->>>>>>> dev_oa_chen9
     let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${this.data.store.erpid}&url=externalcontact/add_contact_way`, {
       data: {
         // accdb: getApp().globalData.config.erpid,
--
libgit2 0.21.4