sunyu::update::resolve conflicts

600259c3 · yu.sun · 191551cc · 600259c3
Commit 600259c3 authored Feb 02, 2021 by yu.sun
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
+0 -4

No files found.
--- a/assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
+++ b/assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
@@ -98,10 +98,6 @@ public class CartGoods {
     * 商品券名称
     */
    private String couponName;
-    /**
-     * 是否是太阳蛋商品
-     */
-    private int isSunnyCoupon = 0;
    private String spuId;
    private String skuId;
    /**