rm commit history

TencentCloud · Feb 16, 2023 · 1f7791c · 1f7791c
1 parent ea5020e
commit 1f7791c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git 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
diff --git 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",