Merge branch 'yongxu-dev' into devlop
# Conflicts: # miniprogram/pages/profile-edit/profile-edit.js # miniprogram/pages/profile-edit/profile-edit.wxml # miniprogram/pages/settings/settings.js # miniprogram/utils/ruleEngine.js # soul-admin/src/pages/distribution/DistributionPage.tsx # soul-admin/src/pages/users/UsersPage.tsx # soul-api/.env.production # soul-api/.gitignore # soul-api/internal/handler/db_ckb_leads.go # soul-api/internal/handler/miniprogram.go # soul-api/internal/handler/referral.go # 开发文档/1、需求/archive/链接人与事-存客宝同步-需求规划.md # 开发文档/1、需求/archive/链接人与事-实现方案.md
This commit is contained in:
@@ -168,7 +168,7 @@ func DBUsersRFM(c *gin.Context) {
|
||||
ru.Phone = *u.Phone
|
||||
}
|
||||
if u.Avatar != nil {
|
||||
ru.Avatar = *u.Avatar
|
||||
ru.Avatar = resolveAvatarURL(*u.Avatar)
|
||||
}
|
||||
result = append(result, ru)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user