fanli-server.git

			@@ -2,24 +2,32 @@

			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;

			/**
			* 专题管理
			*
			* @author yj
			*
			* @date 2018年10月23日
			*/
			@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")
			@@ -38,17 +46,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")
			@@ -67,23 +75,52 @@
			// 跳转是否需要登录
			@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")
			@@ -92,8 +129,47 @@
			// 更新时间
			@Column(name = "b_updatetime")
			private Date updatetime;

			// 是否弹框
			@Expose
			private boolean elastic;
			@Expose // 是否倒计时
			private boolean timeTask;


			// 背景图片
			private String bottomPicture;
			private String bottomPicture;
			// 是否删除图片
			private Boolean delIcon;
			private Boolean delPicture;
			private Boolean delSubPicture;

			// 限制最低版本
			private String version;

			// 起始时间
			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;
			@@ -118,7 +194,6 @@
			public void setCard(String card) {
			this.card = card;
			}


			public String getPicture() {
			return picture;
			@@ -185,6 +260,7 @@
			}

			public Long getState() {

			return state;
			}

			@@ -231,4 +307,141 @@
			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 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;
			}

			public boolean isTimeTask() {
			return timeTask;
			}

			public void setTimeTask(boolean timeTask) {
			this.timeTask = timeTask;
			}

			}