冲突

64938d3c · huiyang.chen · c7db3f42 · 64938d3c
Commit 64938d3c authored Oct 20, 2020 by huiyang.chen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

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

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
@@ -116,7 +116,6 @@ public class ActivityCalculationDiscountRequestDto {
         * 例如8折为80
         */
        private Integer memberDiscount;
-        private String couponCode;
        /**
         * 加料
         */