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 | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 89d06d5..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
@@ -1,12 +1,11 @@
package com.yeshi.fanli.entity.bus.clazz;
import java.io.Serializable;
-import java.util.List;
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
-import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.google.gson.annotations.Expose;
/**
* 鍟嗗搧鍒嗙被
@@ -22,15 +21,19 @@
*/
private static final long serialVersionUID = 1L;
+ @Expose
@Column(name = "id")
private Long id;
+ @Expose
@Column(name = "name")
private String name;
+ @Expose
@Column(name = "picture")
private String picture;
+ @Expose
@Column(name = "url")
private String url;
@@ -52,14 +55,18 @@
@Column(name = "android_click")
private Long androidClick;
+ // 鐘舵��
+ @Column(name = "cs_state")
+ private Integer state;
+
// 鐐瑰嚮娆℃暟
private Long countClick = 0l;
// 鍏宠仈鏍囩鏁伴噺
private int countlabel = 0;
- // 绯荤粺鍏宠仈鍒楄〃
- private List<BusinessSystem> systemList;
+ private String taobaoCids;
+
public GoodsClass() {
}
@@ -67,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) {
@@ -173,12 +185,20 @@
this.countlabel = countlabel;
}
- public List<BusinessSystem> getSystemList() {
- return systemList;
+ public Integer getState() {
+ return state;
}
- public void setSystemList(List<BusinessSystem> systemList) {
- this.systemList = systemList;
+ 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