Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java

@@ -57,6 +57,8 @@
   private String videoCover;

   @Column(name = "cg_video_url")

   private String videoUrl;

   @Column(name = "cg_material_lib_type")

   private Integer materialLibType;// 物料库类型 1-营销商品库 0-非营销商品库

   @Column(name = "cg_createtime")

   private Date createTime;

   @Column(name = "cg_updatetime")

@@ -93,6 +95,14 @@
      this.goodsId = goodsId;

   }



   public Integer getMaterialLibType() {

      return materialLibType;

   }



   public void setMaterialLibType(Integer materialLibType) {

      this.materialLibType = materialLibType;

   }



   public Integer getGoodsType() {

      return goodsType;

   }