Merge branch 'dev-caomeihuzhao-bug2' into container-test

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamCaomeiPassportMapper.xml

@@ -67,7 +67,7 @@
             IFNULL(b.icon, '') AS icon,
             IFNULL(b.share_text, '') AS shareText,
             IFNULL(b.type, 0) AS type,
-            IFNULL(b.performance_id, '') AS performanceId,
+            performance_id AS performanceId,
             ub.created_at AS claimedAt,
             ub.source AS source
         FROM adam_caomei_user_badge ub

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCaomeiBadgeUserServiceImpl.java

@@ -231,6 +231,7 @@ public class AdamCaomeiBadgeUserServiceImpl implements IAdamCaomeiBadgeUserServi
         dto.setClaimedAt(now);
         dto.setSource(source);
         dto.setSubTitle(badge.getSubTitle());
+        dto.setPerformanceId(StringUtils.defaultString(badge.getPerformanceId()));
 
         adamRdmService.addUserCaomeiBadgeDtoByUid(uid, badgeVos, dto);