fix 冲突

shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

@@ -21,7 +21,7 @@ public enum GoodsTypeEnum {
     SKU_GOODS(4, "sku商品"),
     SPU_GOODS(5, "spu商品"),
     REDUCE_PRICE_GOODS(6,"加价购商品"),
-    ALL_COUPON_GOODS(7, "万能券商品"),
+    ALL_COUPON_GOODS(8, "万能券商品"),
     MATERIAL(88, "有加料的商品"),
     EXCEPTION_GOODS(99, "异常商品:商品菜单变化导致和购物车不商品匹配");
     private Integer goodsType;