合并报错修改

396ba2c6 · ping.wu · ae2516ea · 396ba2c6
Commit 396ba2c6 authored Aug 26, 2021 by ping.wu
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullMCountNFoldPromotionService.java
+1 -1

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullMCountNFoldPromotionService.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullMCountNFoldPromotionService.java
 package cn.freemud.service.impl;

-import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;