Skip to content

Conversation

huangxm129
Copy link

No description provided.

增加字段:remark_corp_name,addWay,oper_userid

Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
增加字段:remark_corp_name,addWay,oper_userid

Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>

# Conflicts:
#	weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalContactInfo.java
@@ -121,7 +121,19 @@
private Tag[] tags;
@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.

已改

Signed-off-by: huangxiaoming <huangxm129@163.com>
Signed-off-by: huangxiaoming <huangxm129@163.com>
@binarywang binarywang merged commit a9f9e30 into binarywang:develop Aug 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants