sunyu::resolve conflicts

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

@@ -373,11 +373,6 @@ public class ActivityCalculationDiscountResponseDto {
                  * 赠送商品数量
                  */
                 private Integer sendNumber;
-
-                /**
-                 * 买一赠一时，存赠送主商品的cartGoodsUid用于标记是哪个商品赠送的
-                 */
-                private String originalGoodsUid;
             }
         }