记得上下班打卡 | git大法好,push需谨慎

Commit cb5c38b4 authored by wangyifan's avatar wangyifan

Merge branch 'dev-caomeihuzhao-bug2' into 'master'

草莓护照bug修复

See merge request !417
parents a3869ddc 1a47043a
...@@ -231,6 +231,7 @@ public class AdamCaomeiBadgeUserServiceImpl implements IAdamCaomeiBadgeUserServi ...@@ -231,6 +231,7 @@ public class AdamCaomeiBadgeUserServiceImpl implements IAdamCaomeiBadgeUserServi
dto.setClaimedAt(now); dto.setClaimedAt(now);
dto.setSource(source); dto.setSource(source);
dto.setSubTitle(badge.getSubTitle()); dto.setSubTitle(badge.getSubTitle());
dto.setPerformanceId(StringUtils.defaultString(badge.getPerformanceId()));
adamRdmService.addUserCaomeiBadgeDtoByUid(uid, badgeVos, dto); adamRdmService.addUserCaomeiBadgeDtoByUid(uid, badgeVos, dto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment