From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java |  268 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 260 insertions(+), 8 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 64ab2ee..dade9f3 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
@@ -2,12 +2,14 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import org.yeshi.utils.mybatis.Column;
 import org.yeshi.utils.mybatis.Table;
 
 import com.google.gson.annotations.Expose;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 
 /**
  * 涓撻绠$悊
@@ -16,11 +18,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;
 
@@ -37,13 +53,17 @@
 	@Expose
 	@Column(name = "b_card_id")
 	private Long cardId;
-	
-		
+
 	// 涓诲浘
 	@Expose
 	@Column(name = "b_main_picture")
 	private String picture;
-	
+
+	// 瑁呴グ鍥�
+	@Expose
+	@Column(name = "b_icon")
+	private String icon;
+
 	// 闄勫浘
 	@Expose
 	@Column(name = "b_sub_picture")
@@ -59,22 +79,55 @@
 	@Column(name = "b_params")
 	private String params;
 
+	// 璺宠浆鏄惁闇�瑕佺櫥褰�
+	@Column(name = "b_jump_login")
+	private boolean jumpLogin;
+
 	// 鎺掑簭
 	@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
 	@Column(name = "b_show_type")
 	private String showType;
-	
+
+	@Expose
 	// 澶囨敞
 	@Column(name = "b_remark")
 	private String remark;
+
+	// android鏈�灏忕増鏈�
+	@Column(name = "b_min_android_version_code")
+	private Integer minAndroidVersionCode;
+
+	// ios鏈�灏忕増鏈�
+	@Column(name = "b_min_ios_version_code")
+	private Integer minIOSVersionCode;
+
+	//璧峰鏃堕棿
+	@Column(name = "b_start_time")
+	private Date startTime;
+	
+	//缁撴潫鏃堕棿
+	@Column(name = "b_end_time")
+	private Date endTime;
 	
 	// 鍒涘缓鏃堕棿
 	@Column(name = "b_createtime")
@@ -83,7 +136,46 @@
 	// 鏇存柊鏃堕棿
 	@Column(name = "b_updatetime")
 	private Date updatetime;
+
+	// 鏄惁寮规
+	@Expose
+	private boolean elastic;
+
+	// 鑳屾櫙鍥剧墖
+	private String bottomPicture;
+	// 鏄惁鍒犻櫎鍥剧墖
+	private Boolean delIcon;
+	private Boolean delPicture;
+	private Boolean delSubPicture;
+
+	// 闄愬埗鏈�浣庣増鏈�
+	private String version;
 	
+	
+	// 鏄惁瀹氭椂
+	@Expose
+	private boolean timeTask;
+	// 璧峰鏃堕棿
+	private String startTime_str;
+	// 缁撴潫鏃堕棿
+	private String endTime_str;
+	
+	@Expose
+	private long countDownTime;//鍊掕鏃�
+
+	private List<SpecialLabel> listLabels; //鏍囩
+	
+	@Expose
+	private List<ClientTextStyleVO> labels; //鏍囩
+
+	
+	public long getCountDownTime() {
+		return countDownTime;
+	}
+
+	public void setCountDownTime(long countDownTime) {
+		this.countDownTime = countDownTime;
+	}
 
 	public Long getId() {
 		return id;
@@ -108,7 +200,6 @@
 	public void setCard(String card) {
 		this.card = card;
 	}
-
 
 	public String getPicture() {
 		return picture;
@@ -175,6 +266,7 @@
 	}
 
 	public Long getState() {
+
 		return state;
 	}
 
@@ -198,4 +290,164 @@
 		this.remark = remark;
 	}
 
+	public boolean isJumpLogin() {
+		return jumpLogin;
+	}
+
+	public void setJumpLogin(boolean jumpLogin) {
+		this.jumpLogin = jumpLogin;
+	}
+
+	public String getBottomPicture() {
+		return bottomPicture;
+	}
+
+	public void setBottomPicture(String bottomPicture) {
+		this.bottomPicture = bottomPicture;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	public Boolean getDelIcon() {
+		return delIcon;
+	}
+
+	public void setDelIcon(Boolean delIcon) {
+		this.delIcon = delIcon;
+	}
+
+	public Boolean getDelPicture() {
+		return delPicture;
+	}
+
+	public void setDelPicture(Boolean delPicture) {
+		this.delPicture = delPicture;
+	}
+
+	public Boolean getDelSubPicture() {
+		return delSubPicture;
+	}
+
+	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;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public Integer getMinAndroidVersionCode() {
+		return minAndroidVersionCode;
+	}
+
+	public void setMinAndroidVersionCode(Integer minAndroidVersionCode) {
+		this.minAndroidVersionCode = minAndroidVersionCode;
+	}
+
+	public Integer getMinIOSVersionCode() {
+		return minIOSVersionCode;
+	}
+
+	public void setMinIOSVersionCode(Integer minIOSVersionCode) {
+		this.minIOSVersionCode = minIOSVersionCode;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public boolean isTimeTask() {
+		return timeTask;
+	}
+
+	public void setTimeTask(boolean timeTask) {
+		this.timeTask = timeTask;
+	}
+
+	public String getStartTime_str() {
+		return startTime_str;
+	}
+
+	public void setStartTime_str(String startTime_str) {
+		this.startTime_str = startTime_str;
+	}
+
+	public String getEndTime_str() {
+		return endTime_str;
+	}
+
+	public void setEndTime_str(String endTime_str) {
+		this.endTime_str = endTime_str;
+	}
+
+	public List<ClientTextStyleVO> getLabels() {
+		return labels;
+	}
+
+	public void setLabels(List<ClientTextStyleVO> labels) {
+		this.labels = labels;
+	}
+
+	public List<SpecialLabel> getListLabels() {
+		return listLabels;
+	}
+
+	public void setListLabels(List<SpecialLabel> listLabels) {
+		this.listLabels = listLabels;
+	}
+
 }

--
Gitblit v1.8.0