Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletDecorationConfigApiServiceImpl.java

@@ -367,12 +367,12 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
             if (CollectionUtils.isNotEmpty(cardList)) {
                 for (MemberCardRelDTO card : cardList) {
                     List<MemberCardRelDTO> sub = card.getRelCards();
-                    Boolean isMainCard = card.getId().toString().endsWith(mainCardId);
+                    Boolean isMainCard = card.getId().toString().equals(mainCardId);
 
                     List<AppletCardDTO> subList = new ArrayList<>();
                     if (CollectionUtils.isNotEmpty(sub)) {
                         for (MemberCardRelDTO subTemp : sub) {
-                            Boolean isMainCardTemp = subTemp.getId().toString().endsWith(mainCardId);
+                            Boolean isMainCardTemp = subTemp.getId().toString().equals(mainCardId);
                             subList.add(new AppletCardDTO().setCardConfigId(subTemp.getId())
                                     .setCardName(subTemp.getName()).setMainCard(isMainCardTemp));
                         }