From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/clazz/GoodsClass.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 a19e5b0..af70360 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,6 +1,7 @@
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;
@@ -20,6 +21,15 @@
*
*/
private static final long serialVersionUID = 1L;
+
+ public final static int SEX_DEFAULT = 0; // 閫氱敤
+ public final static int SEX_WOMAN = 1; // 濂�
+ public final static int SEX_MAN = 2; // 鐢�
+ public final static int SEX_DEFAULT_WOMAN = 10; // 濂�+ 閫氱敤
+ public final static int SEX_DEFAULT_MAN = 20; // 鐢�+ 閫氱敤
+ public final static int SEX_MAN_WOMAN = 12; // 鐢�+ 濂�
+
+ public final static int SEX_ALL = 120; // 鐢�+ 濂� + 閫氱敤
@Expose
@Column(name = "id")
@@ -59,12 +69,29 @@
@Column(name = "cs_state")
private Integer state;
+ @Column(name = "sex")
+ private Integer sex;//鐢峰コ 0-閮ㄥ垎鐢峰コ 1-鐢� 2-濂�
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
// 鐐瑰嚮娆℃暟
private Long countClick = 0l;
// 鍏宠仈鏍囩鏁伴噺
private int countlabel = 0;
+ private String taobaoCids;
+
+ // 鍔ㄦ�佷簩绾у晢鍝佸垎绫�
+ @Expose
+ private List<GoodsClass> listSub;
+
public GoodsClass() {
}
@@ -190,7 +217,21 @@
public void setState(Integer state) {
this.state = state;
}
-
-
+
+ public String getTaobaoCids() {
+ return taobaoCids;
+ }
+
+ public void setTaobaoCids(String taobaoCids) {
+ this.taobaoCids = taobaoCids;
+ }
+
+ public List<GoodsClass> getListSub() {
+ return listSub;
+ }
+
+ public void setListSub(List<GoodsClass> listSub) {
+ this.listSub = listSub;
+ }
}
--
Gitblit v1.8.0