Merge remote-tracking branch 'origin/master'
# Conflicts:
# cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
# cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/ForeignAddFriendMapper.java
# cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/ForeignAddFriend.java
# cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/SourceQuery.java
# cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/ForeignAddFriendMapper.xml
|
bynt