8000 修改添加企业客户标签后无返回信息 by huangxm129 · Pull Request #1699 · binarywang/WxJava · GitHub
[go: up one dir, main page]
Skip to content

修改添加企业客户标签后无返回信息 #1699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Aug 6, 2020
Merged

修改添加企业客户标签后无返回信息 #1699

Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2b27c03
外部联系人客户详情新增增加字段
huangxm129 Jul 29, 2020
755c743
修改测试类
huangxm129 Jul 29, 2020
33e584d
客户标签组查询列表功能修改
huangxm129 Jul 30, 2020
03b33a9
修改测试类
huangxm129 Jul 30, 2020
a570172
修改 add_way字段错误
huangxm129 Jul 30, 2020
2faa870
修改添加企业客户标签后无返回信息
huangxm129 Aug 3, 2020
4e31ee4
外部联系人客户详情新增增加字段
huangxm129 Jul 29, 2020
10f68f3
修改测试类
huangxm129 Jul 29, 2020
cf5bd28
修改测试类
huangxm129 Jul 30, 2020
b410fa6
修改 add_way字段错误
huangxm129 Jul 30, 2020
d47d9df
修改添加企业客户标签后无返回信息
huangxm129 Aug 3, 2020
956c068
Merge remote-tracking branch 'origin/develop' into develop
huangxm129 Aug 4, 2020
5d054cd
修改错误
huangxm129 Aug 4, 2020
eea345a
修改冲突
huangxm129 Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public static class FollowedUser {
@SerializedName("remark_corp_name")
private String remarkCorpName;
<<<<<<< HEAD
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

冲突没解决吧？

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已改

<<<<<<< HEAD
<<<<<<< HEAD
@SerializedName("add_way")
=======
Expand All @@ -130,6 +131,9 @@ public static class FollowedUser {
=======
@SerializedName("add_way")
>>>>>>> 修改 add_way字段错误
=======
@SerializedName("add_way")
>>>>>>> origin/develop
private String addWay;
@SerializedName("oper_userid")
private String operUserId;
Expand Down
0