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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -65,6 +65,9 @@
   private Integer materialLibType;// 物料库类型 1-营销商品库 0-非营销商品库

   @Column(name = "cg_other_info")

   private String otherInfo; // 商品其他信息-json字符串

   @Column(name = "cg_category_info")

   private String categoryInfo; // 商品分类信息

	
   @Column(name = "cg_createtime")

   private Date createTime;

   @Column(name = "cg_updatetime")

@@ -268,5 +271,13 @@
   public void setOtherInfo(String otherInfo) {

      this.otherInfo = otherInfo;

   }



   public String getCategoryInfo() {

      return categoryInfo;

   }



   public void setCategoryInfo(String categoryInfo) {

      this.categoryInfo = categoryInfo;

   }

   

}