Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java

@@ -65,6 +65,8 @@
   // 关联标签数量

   private int countlabel = 0; 



   private String taobaoCids;

	
   

   public GoodsClass() {

   }

@@ -190,7 +192,13 @@
   public void setState(Integer state) {

      this.state = state;

   }

	
	


   public String getTaobaoCids() {

      return taobaoCids;

   }



   public void setTaobaoCids(String taobaoCids) {

      this.taobaoCids = taobaoCids;

   }



}