sunyu::update::resolve conflicts

d421fe45 · yu.sun · 600259c3 · d421fe45
Commit d421fe45 authored Feb 02, 2021 by yu.sun
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
+4 -0

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
@@ -204,6 +204,10 @@ public class CartGoods {
     */
    private int isMonthCard;
    /**
+     * 是否是太阳蛋商品
+     */
+    private int isSunnyCoupon=0;
+    /**
     * 是否为种子券商品 1:是；0:否
     */
    private int isSeedCouponGoods;