V6.2.3组合商品

base-module/src/main/java/com/caimei/module/base/entity/po/CmProductCombination.java

@@ -0,0 +1,37 @@
+package com.caimei.module.base.entity.po;
+
+import com.caimei.module.base.entity.vo.ProductVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 组合商品Entity
+ * @author lijun
+ * @version 2020-04-29
+ */
+ @Data
+public class CmProductCombination implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
+	/**
+	 * 组合名称
+	 */
+	private String name;
+	/**
+	 * 添加时间
+	 */
+	private Date addTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+	/**
+	 * 组合商品list
+	 */
+	private List<ProductVo> combinationProductList;
+}

base-module/src/main/java/com/caimei/module/base/entity/po/Product.java

@@ -529,5 +529,10 @@ public class Product implements Serializable {
      */
     private String machineType;
 
+    /**
+     * 商品备注
+     */
+    private String productRemarks;
+
     private static final long serialVersionUID = 1L;
 }

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -11,7 +11,7 @@
         tinyTypeID, smallTypeID, `name`, tinyTypeCode, icon, validFlag, seo, sortIndex
     </sql>
     <sql id="Product_Column_List">
-        productID, brandID, tinyTypeID, preferredFlag, selfTypeID, shopID, `name`, aliasName, searchKey,
+        productID, brandID, tinyTypeID, preferredFlag, selfTypeID, shopID, `name`, aliasName, searchKey, productRemarks,
         normalPrice, price, highestUserLevelPrice, lowestUserLevelPrice, lowestUserLevelID,
         price0, price0Grade, price0Text, price0TextFlag, price1, price1Grade, price1Text,
         price1TextFlag, price8, price8Grade, price8Text, price8TextFlag, ladderPriceFlag,