合并冲突修改

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -117,30 +117,6 @@ public class ActivityCalculationDiscountRequestDto {
          */
         private List<Material> smallMaterial;
 
-        private List<Material> smallMaterial;
-
-
-        @Data
-        @NoArgsConstructor
-        static public class Material {
-            /**
-             * 加料商品ID
-             */
-            private String goodsId;
-            /**
-             * 加料数量
-             */
-            private Integer goodsQuantity;
-            /**
-             * 加料单价
-             */
-            private Long originalPrice;
-            /**
-             * 1 :小料、2：可选搭配
-             */
-            private int type;
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o)