From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java | 114 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 28 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 cc5a0f2..2d61808 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
@@ -17,64 +17,108 @@
@Table("yeshi_ec_sub_class")
public class GoodsSubClass implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Expose
@Column(name = "sub_id")
private Long id;
-
+
@Expose
@Column(name = "sub_name")
- private String name; // 鍚嶇О
-
+ private String name; // 鍚嶇О
+
@Expose
@Column(name = "sub_picture")
private String picture; // 鍥剧墖璺緞
-
+
+ @Column(name = "sub_picture_second")
+ private String pictureSecond; // 鏂扮増鍥剧墖1.5.3
+
@Column(name = "sub_weight")
private Integer weight; // 鏉冮噸-鎺掑簭
-
+
@Column(name = "sub_state")
- private Integer state; // 鐘舵�� 1鍚敤 0鍋滅敤
-
+ private Integer state; // 鐘舵�� 1鍚敤 0鍋滅敤
+
@Column(name = "sub_root_id")
private GoodsClass rootClass; // 涓�绾х被鍒�
-
+
@Column(name = "sub_pid")
- private GoodsSubClass parent ; // 涓婄骇锛氬搴旂殑浜岀骇浠ヤ笅鍒嗙被 鐢ㄤ簬3绾с��4绾с��5绾�
-
+ private GoodsSubClass parent; // 涓婄骇锛氬搴旂殑浜岀骇浠ヤ笅鍒嗙被 鐢ㄤ簬3绾с��4绾с��5绾�
+
@Column(name = "sub_level")
- private Integer level; // 鍏蜂綋绛夌骇
-
+ private Integer level; // 鍏蜂綋绛夌骇
+
@Column(name = "sub_key")
- private String key; // 鎼滅储鍏抽敭璇�
-
+ private String key; // 鎼滅储鍏抽敭璇�
+
@Column(name = "sub_search_json")
- private String searchJson; // 鎼滅储鏉′欢
-
+ private String searchJson; // 鎼滅储鏉′欢
+
@Column(name = "sub_ios_click")
- private Long iosClick = 0l;
-
+ private Long iosClick = 0l;
+
@Column(name = "sub_android_click")
- private Long androidClick = 0l;
+ private Long androidClick = 0l;
+
+ private String taobaoCids;
+
+
@Column(name = "sub_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
-
+
@Column(name = "sub_updatetime")
private Date updatetime; // 鍒涘缓鏃堕棿
+ @Column(name = "sub_sex")
+ private Integer sex;//鎬у埆
+ @Column(name = "sub_month")
+ private String month;//鏈堜唤
- private Long countClick = 0l;
+ private GoodsSubClassLabel classLabel;//鏍囩
+
+
+
+ public GoodsSubClassLabel getClassLabel() {
+ return classLabel;
+ }
+
+ public void setClassLabel(GoodsSubClassLabel classLabel) {
+ this.classLabel = classLabel;
+ }
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getMonth() {
+ return month;
+ }
+
+ public void setMonth(String month) {
+ this.month = month;
+ }
+
+ private Long countClick = 0l;
// 鍏宠仈鏍囩鏁伴噺
- private int countlabel = 0;
-
+ private int countlabel = 0;
+
private String searchParam;
-
- public GoodsSubClass(){}
-
+
+ public GoodsSubClass() {
+ }
+
public GoodsSubClass(Long id) {
this.id = id;
}
-
public Long getId() {
return id;
@@ -115,7 +159,6 @@
public void setCreatetime(Date createtime) {
this.createtime = createtime;
}
-
public GoodsSubClass getParent() {
return parent;
@@ -212,5 +255,20 @@
public void setCountClick(Long countClick) {
this.countClick = countClick;
}
+
+ public String getPictureSecond() {
+ return pictureSecond;
+ }
+
+ public void setPictureSecond(String pictureSecond) {
+ this.pictureSecond = pictureSecond;
+ }
+ public String getTaobaoCids() {
+ return taobaoCids;
+ }
+
+ public void setTaobaoCids(String taobaoCids) {
+ this.taobaoCids = taobaoCids;
+ }
}
--
Gitblit v1.8.0