Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

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

@@ -500,6 +500,8 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         }else if(shoppingCartInfoRequestVo.getType() != null && shoppingCartInfoRequestVo.getType().intValue() == 0){
             // 根据人员分类购物车 个人购物车
             shoppingCartCollageResponseVo = splitByUser(shoppingCartGoodsResponseVo,crateUserId,partnerId,storeId,currentUserId);
+            // 个人购物车隐藏满减提示
+            shoppingCartCollageResponseVo.setActivityTip(new ActivityTip());
         }else{
             // 整合购物车
             shoppingCartCollageResponseVo = new ShoppingCartCollageResponseVo();