Merge remote-tracking branch 'origin/test' into test

eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java

@@ -113,8 +113,12 @@ public class TbProduct implements Serializable {
     @ApiModelProperty(value = "是否热销")
     private Integer isHot = 0;
 
+    @Column(name = "`type`")
+    @ApiModelProperty(value = "商品类型（属性）:普通商品 normal 套餐商品 package 称重商品 weigh 团购券 coupon")
+    private String type;
+
     @Column(name = "`type_enum`")
-    @ApiModelProperty(value = "商品规格：0-单规格 1多规格")
+    @ApiModelProperty(value = "商品规格：normal-单规格  sku-多规格")
     private String typeEnum;
 
     @Column(name = "`is_del`",nullable = false)