From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsSubClass.java | 181 +++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 97 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 b2dbf12..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
@@ -3,16 +3,8 @@
import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
@@ -22,105 +14,78 @@
* @author Administrator
*
*/
-@Entity
-@Table(name = "yeshi_ec_sub_class")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_sub_class")
-public class GoodsSubClass implements Serializable{
+@Table("yeshi_ec_sub_class")
+public class GoodsSubClass implements Serializable {
+
/**
*
*/
private static final long serialVersionUID = 1L;
- @Id
@Expose
@Column(name = "sub_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name="sub_id")
private Long id;
-
- @Expose
- @Column(name = "sub_name")
- @org.yeshi.utils.mybatis.Column(name="sub_name")
- private String name; // 鍚嶇О
-
- @Expose
- @Column(name = "sub_picture")
- @org.yeshi.utils.mybatis.Column(name="sub_picture")
- private String picture; // 鍥剧墖璺緞
-
- @Expose
- @Column(name = "sub_weight")
- @org.yeshi.utils.mybatis.Column(name="sub_weight")
- private Integer weight; // 鏉冮噸-鎺掑簭
-
- @Expose
- @Column(name = "sub_state")
- @org.yeshi.utils.mybatis.Column(name="sub_state")
- private Integer state; // 鐘舵�� 1鍚敤 0鍋滅敤
-
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sub_root_id")
- @org.yeshi.utils.mybatis.Column(name="sub_root_id")
- private GoodsClass rootClass; // 涓�绾х被鍒�
-
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sub_pid")
- @org.yeshi.utils.mybatis.Column(name="sub_pid")
- private GoodsSubClass parent ; // 涓婄骇锛氬搴旂殑浜岀骇浠ヤ笅鍒嗙被 鐢ㄤ簬3绾с��4绾с��5绾�
-
-
- @Expose
- @Column(name = "sub_level")
- @org.yeshi.utils.mybatis.Column(name="sub_level")
- private Integer level; // 鍏蜂綋绛夌骇
-
- @Expose
- @Column(name = "sub_key")
- @org.yeshi.utils.mybatis.Column(name="sub_key")
- private String key; // 鎼滅储鍏抽敭璇�
-
@Expose
+ @Column(name = "sub_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鍋滅敤
+
+ @Column(name = "sub_root_id")
+ private GoodsClass rootClass; // 涓�绾х被鍒�
+
+ @Column(name = "sub_pid")
+ private GoodsSubClass parent; // 涓婄骇锛氬搴旂殑浜岀骇浠ヤ笅鍒嗙被 鐢ㄤ簬3绾с��4绾с��5绾�
+
+ @Column(name = "sub_level")
+ private Integer level; // 鍏蜂綋绛夌骇
+
+ @Column(name = "sub_key")
+ private String key; // 鎼滅储鍏抽敭璇�
+
@Column(name = "sub_search_json")
- @org.yeshi.utils.mybatis.Column(name="sub_search_json")
- private String searchJson; // 鎼滅储鏉′欢
-
-
- @Expose
+ private String searchJson; // 鎼滅储鏉′欢
+
@Column(name = "sub_ios_click")
- @org.yeshi.utils.mybatis.Column(name="sub_ios_click")
- private Long iosClick = 0l;
-
- @Expose
+ private Long iosClick = 0l;
+
@Column(name = "sub_android_click")
- @org.yeshi.utils.mybatis.Column(name="sub_android_click")
- private Long androidClick = 0l;
+ private Long androidClick = 0l;
+
+ private String taobaoCids;
+
- @Expose
+
@Column(name = "sub_createtime")
- @org.yeshi.utils.mybatis.Column(name="sub_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
-
- @Expose
+
@Column(name = "sub_updatetime")
- @org.yeshi.utils.mybatis.Column(name="sub_updatetime")
private Date updatetime; // 鍒涘缓鏃堕棿
-
- @Transient
- private Long CountClick = 0l;
- @Transient // 鍏宠仈鏍囩鏁伴噺
- private int countlabel = 0;
-
-
- public GoodsSubClass(){}
-
+
+ private Long countClick = 0l;
+ // 鍏宠仈鏍囩鏁伴噺
+ private int countlabel = 0;
+
+ private String searchParam;
+
+ public GoodsSubClass() {
+ }
+
public GoodsSubClass(Long id) {
this.id = id;
}
-
-
-
-
public Long getId() {
return id;
@@ -162,7 +127,6 @@
this.createtime = createtime;
}
-
public GoodsSubClass getParent() {
return parent;
}
@@ -193,14 +157,6 @@
public void setAndroidClick(Long androidClick) {
this.androidClick = androidClick;
- }
-
- public Long getCountClick() {
- return CountClick;
- }
-
- public void setCountClick(Long countClick) {
- CountClick = countClick;
}
public Integer getLevel() {
@@ -250,5 +206,36 @@
public void setState(Integer state) {
this.state = state;
}
+
+ public String getSearchParam() {
+ return searchParam;
+ }
+
+ public void setSearchParam(String searchParam) {
+ this.searchParam = searchParam;
+ }
+
+ public Long getCountClick() {
+ return countClick;
+ }
+
+ 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