From efa2645b74ebfadc43ebe448370adb22aecc1ad7 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:14:09 +0800
Subject: [PATCH] Merge branch 'div_10'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java
index fb03a86..7bc829a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java
@@ -66,6 +66,8 @@
 
 	private String taobaoCids;
 
+	
+
 	@Column(name = "sub_createtime")
 	private Date createtime; // 鍒涘缓鏃堕棿
 
@@ -77,8 +79,6 @@
 	private int countlabel = 0;
 
 	private String searchParam;
-
-	private GoodsSubClassLabel classLabel;
 
 	public GoodsSubClass() {
 	}
@@ -230,7 +230,7 @@
 	public void setPictureSecond(String pictureSecond) {
 		this.pictureSecond = pictureSecond;
 	}
-
+	
 	public String getTaobaoCids() {
 		return taobaoCids;
 	}
@@ -238,13 +238,4 @@
 	public void setTaobaoCids(String taobaoCids) {
 		this.taobaoCids = taobaoCids;
 	}
-
-	public GoodsSubClassLabel getClassLabel() {
-		return classLabel;
-	}
-
-	public void setClassLabel(GoodsSubClassLabel classLabel) {
-		this.classLabel = classLabel;
-	}
-
 }

--
Gitblit v1.8.0