Commit 102a7f69 authored by yanglbme's avatar yanglbme

fix: doc conflict

parent 1c3b44ea
......@@ -63,18 +63,10 @@ ImClient client = ImClient.getInstance(appId, identifier, key, config);
```java
AccountImportRequest request = AccountImportRequest.builder()
<<<<<<< Updated upstream
.identifier("admin")
.faceUrl("https://avatars.githubusercontent.com/u/43716716?s=200&v=4")
.nick("doocs")
.build();
=======
.identifier("admin")
.faceUrl("https://avatars.githubusercontent.com/u/43716716?s=200&v=4")
.nick("doocs")
.build();
>>>>>>> Stashed changes
AccountImportResult result = client.account.accountImport(request);
```
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -60,7 +60,7 @@ public class AccountTest {
public void testAccountDelete() throws IOException {
AccountDeleteItem item1 = AccountDeleteItem.builder().userId("acbin").build();
AccountDeleteItem item2 = AccountDeleteItem.builder().userId("test1").build();
AccountDeleteRequest request = AccountDeleteRequest.builder().deleteItemList(Collections.singletonList(item1)).build();
AccountDeleteRequest request = AccountDeleteRequest.builder().deleteItemList(Arrays.asList(item1, item2)).build();
AccountDeleteResult result = client.account.accountDelete(request);
System.out.println(result);
Assert.assertEquals("OK", result.getActionStatus());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment