From 1f7791c99cd91707f1abe09e48fcbdd22994421f Mon Sep 17 00:00:00 2001
From: xingchenhe <xingchenhe@tencent.com>
Date: Thu, 16 Feb 2023 11:36:23 +0800
Subject: [PATCH] rm commit history

---
 Electron/im_electron_sdk/client/src/apis.js              | 9 +++++++++
 .../im_electron_sdk/im_electron_sdk/package-lock.json    | 8 ++++++++
 Electron/im_electron_sdk/im_electron_sdk/package.json    | 4 ++++
 3 files changed, 21 insertions(+)

diff --git a/Electron/im_electron_sdk/client/src/apis.js b/Electron/im_electron_sdk/client/src/apis.js
index 7b2e6766ebe..55ac093c65f 100644
--- a/Electron/im_electron_sdk/client/src/apis.js
+++ b/Electron/im_electron_sdk/client/src/apis.js
@@ -9,8 +9,11 @@ let createdGroupId;
 let seq = {
     group_get_memeber_info_list_result_next_seq: 0
 };
+<<<<<<< HEAD
 let users = [];
 let msg = null;
+=======
+>>>>>>> cc863a101 (update im electron sdk to 1.4.10)
 const APIS = [
     {
         manager: "timBaseManager",
@@ -474,10 +477,16 @@ const APIS = [
                 action: (callback) => {
                     
                     TimGroupManager.TIMGroupGetMemberInfoList(createdGroupId,seq.group_get_memeber_info_list_result_next_seq).then(data => {
+<<<<<<< HEAD
                         const d = JSON.parse(data.data.json_param);
                         //  seq = JSON.parse(data.data.json_param).group_get_memeber_info_list_result_next_seq
                         seq = d;
                         console.log('本次获取数据',d.group_get_memeber_info_list_result_info_array.map((item)=>{ console.log(item.group_member_info_identifier);return item; }));
+=======
+                        console.log(data.data.json_param)
+                        //  seq = JSON.parse(data.data.json_param).group_get_memeber_info_list_result_next_seq
+                        seq = JSON.parse(data.data.json_param);
+>>>>>>> cc863a101 (update im electron sdk to 1.4.10)
                         callback(JSON.stringify(data))
 
                     }).catch(err => {
diff --git a/Electron/im_electron_sdk/im_electron_sdk/package-lock.json b/Electron/im_electron_sdk/im_electron_sdk/package-lock.json
index 9b0631ca31f..66b118318ae 100644
--- a/Electron/im_electron_sdk/im_electron_sdk/package-lock.json
+++ b/Electron/im_electron_sdk/im_electron_sdk/package-lock.json
@@ -1,12 +1,20 @@
 {
   "name": "im_electron_sdk",
+<<<<<<< HEAD
   "version": "1.4.23",
+=======
+  "version": "1.4.20",
+>>>>>>> cc863a101 (update im electron sdk to 1.4.10)
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "im_electron_sdk",
+<<<<<<< HEAD
       "version": "1.4.23",
+=======
+      "version": "1.4.20",
+>>>>>>> cc863a101 (update im electron sdk to 1.4.10)
       "cpu": [
         "x64",
         "ia32",
diff --git a/Electron/im_electron_sdk/im_electron_sdk/package.json b/Electron/im_electron_sdk/im_electron_sdk/package.json
index aedc6a309ca..d8de1363bb6 100644
--- a/Electron/im_electron_sdk/im_electron_sdk/package.json
+++ b/Electron/im_electron_sdk/im_electron_sdk/package.json
@@ -1,6 +1,10 @@
 {
   "name": "im_electron_sdk",
+<<<<<<< HEAD
   "version": "1.4.23",
+=======
+  "version": "1.4.20",
+>>>>>>> cc863a101 (update im electron sdk to 1.4.10)
   "description": "tencent cloud im for electron base c++ apis.",
   "main": "dist/main.js",
   "browser": "dist/renderer.js",