Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java

@@ -37,7 +37,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
             // coco返回的活动中剔除集点活动
             if(discountResult.getDiscounts() != null && !discountResult.getDiscounts().isEmpty()){
                 discountResult.getDiscounts().forEach(discount -> {
-                    if(ActivityTypeEnum.TYPE_221.equals(discount.getType())){
+                    if(ActivityTypeEnum.TYPE_221.getCode().equals(discount.getType())){
                         return;
                     }
                     discounts.add(discount);