Merge branch 'ww' into test

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java

@@ -66,11 +66,6 @@ public class TbProduct implements Serializable {
 
     private String typeEnum;
 
-    /**
-     * 是否共享库存
-     */
-    private Byte isDistribute;
-
     private Byte isDel;
 
     private Byte isStock;
@@ -406,13 +401,6 @@ public class TbProduct implements Serializable {
         this.typeEnum = typeEnum == null ? null : typeEnum.trim();
     }
 
-    public Byte getIsDistribute() {
-        return isDistribute;
-    }
-
-    public void setIsDistribute(Byte isDistribute) {
-        this.isDistribute = isDistribute;
-    }
 
     public Byte getIsDel() {
         return isDel;

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserCouponVo.java

@@ -16,6 +16,7 @@ public class UserCouponVo {
     private String detail;
     private String shopId;
     private String shopName;
+    private String orderId;
     /**
      * 优惠金额
      */