From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java
index 486cdaa..ebe8d9c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java
+++ b/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() {
}
@@ -72,6 +74,11 @@
public GoodsClass(Long id) {
super();
this.id = id;
+ }
+
+ public GoodsClass(Long id, String name) {
+ this.id = id;
+ this.name = name;
}
public GoodsClass(String name, String picture, Integer orderby, Long createtime) {
@@ -185,7 +192,13 @@
public void setState(Integer state) {
this.state = state;
}
-
-
+
+ public String getTaobaoCids() {
+ return taobaoCids;
+ }
+
+ public void setTaobaoCids(String taobaoCids) {
+ this.taobaoCids = taobaoCids;
+ }
}
--
Gitblit v1.8.0