Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
95e7530d
Commit
95e7530d
authored
Oct 24, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_xgh_pendingid' into 'developer'
同步 See merge request
!332
parents
d3cdaa08
7dff4ae3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
0 deletions
+1
-0
FriendSyncNewOperation.java
...an/manage/service/task/friend/FriendSyncNewOperation.java
+1
-0
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java
View file @
95e7530d
...
...
@@ -104,6 +104,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
externalUserDTO
.
setUnionId
(
selfUserData
.
getUnionId
());
externalUserDTO
.
setSelfExternalUserId
(
selfUserData
.
getExternalUserId
());
externalUserDTO
.
setAvatar
(
selfUserData
.
getAvatar
());
externalUserDTO
.
setName
(
selfUserData
.
getName
());
//序列化数据
String
ret
=
dealMerge
(
externalUserDTO
,
dataPre
);
if
(
StringUtils
.
isNotBlank
(
ret
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment