From b1f7380b94ff1189759ed14b563fed6534f73ab0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 10:49:13 +0800
Subject: [PATCH] Merge branch 'dev_4'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 7bc829a..fb03a86 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,8 +66,6 @@
private String taobaoCids;
-
-
@Column(name = "sub_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
@@ -79,6 +77,8 @@
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,4 +238,13 @@
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