From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
index f645862..95c0753 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -16,11 +16,25 @@
*
* @date 2018骞�10鏈�23鏃�
*/
+/**
+ * @author Administrator
+ *
+ */
@Table("yeshi_ec_special")
public class Special implements Serializable {
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 = "b_id")
private Long id;
@@ -72,9 +86,21 @@
@Column(name = "b_orderby")
private Integer orderby;
+ // 鎺掑簭
+ @Column(name = "b_order_man")
+ private Integer orderMan;
+
+ // 鎺掑簭
+ @Column(name = "b_order_woman")
+ private Integer orderWoman;
+
// 鐘舵��
@Column(name = "b_state")
private Long state;
+
+ // 鎬у埆鍖哄垎
+ @Column(name = "b_sex")
+ private Integer sex;
// 鏄剧ず绫诲瀷锛氬渾褰㈠浘 銆佸ぇ鍥�
@Expose
@@ -100,6 +126,11 @@
private Boolean delIcon;
private Boolean delPicture;
private Boolean delSubPicture;
+
+ // 鏄惁寮规
+ @Expose
+ private boolean elastic;
+
public Long getId() {
return id;
@@ -261,5 +292,37 @@
public void setDelSubPicture(Boolean delSubPicture) {
this.delSubPicture = delSubPicture;
}
+
+ public boolean isElastic() {
+ return elastic;
+ }
+
+ public void setElastic(boolean elastic) {
+ this.elastic = elastic;
+ }
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public Integer getOrderMan() {
+ return orderMan;
+ }
+
+ public void setOrderMan(Integer orderMan) {
+ this.orderMan = orderMan;
+ }
+
+ public Integer getOrderWoman() {
+ return orderWoman;
+ }
+
+ public void setOrderWoman(Integer orderWoman) {
+ this.orderWoman = orderWoman;
+ }
}
--
Gitblit v1.8.0