fanli-server.git

			@@ -3,16 +3,10 @@
			import java.io.Serializable;
			import java.util.Date;

			import javax.persistence.Column;
			import javax.persistence.Entity;
			import javax.persistence.FetchType;
			import javax.persistence.GeneratedValue;
			import javax.persistence.GenerationType;
			import javax.persistence.Id;
			import javax.persistence.JoinColumn;
			import javax.persistence.ManyToOne;
			import javax.persistence.Table;
			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;

			/**
			@@ -22,64 +16,120 @@
			*
			* @date 2018年10月23日
			*/
			@Entity
			@Table(name = "yeshi_ec_special")
			@org.yeshi.utils.mybatis.Table("yeshi_ec_special")
			/**
			* @author Administrator
			*
			*/
			@Table("yeshi_ec_special")
			public class Special implements Serializable {

			private static final long serialVersionUID = 1L;

			@Id

			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")
			@GeneratedValue(strategy = GenerationType.AUTO)
			@org.yeshi.utils.mybatis.Column(name = "b_id")
			private Long id;

			// 名称
			@JoinColumn(name = "b_name")
			@org.yeshi.utils.mybatis.Column(name = "b_name")
			@Expose
			@Column(name = "b_name")
			private String name;

			// 唯一标识
			@JoinColumn(name = "b_card")
			@org.yeshi.utils.mybatis.Column(name = "b_card")
			@Column(name = "b_card")
			private String card;

			// Android链接
			@JoinColumn(name = "b_main_picture")
			@org.yeshi.utils.mybatis.Column(name = "b_main_picture")
			// 标识管理id
			@Expose
			@Column(name = "b_card_id")
			private Long cardId;

			// 主图
			@Expose
			@Column(name = "b_main_picture")
			private String picture;

			// IOS跳转链接
			@JoinColumn(name = "b_sub_picture")
			@org.yeshi.utils.mybatis.Column(name = "b_sub_picture")

			// 装饰图
			@Expose
			@Column(name = "b_icon")
			private String icon;

			// 附图
			@Expose
			@Column(name = "b_sub_picture")
			private String subPicture;

			// 跳转详情
			@ManyToOne(fetch = FetchType.EAGER)
			@JoinColumn(name = "b_jumpid")
			@org.yeshi.utils.mybatis.Column(name = "b_jumpid")
			@Expose
			@Column(name = "b_jumpid")
			private JumpDetailV2 jumpDetail;

			// 跳转参数
			@JoinColumn(name = "b_params")
			@org.yeshi.utils.mybatis.Column(name = "b_params")
			@Expose
			@Column(name = "b_params")
			private String params;

			// 跳转是否需要登录
			@Column(name = "b_jump_login")
			private boolean jumpLogin;

			// 排序
			@JoinColumn(name = "b_orderby")
			@org.yeshi.utils.mybatis.Column(name = "b_orderby")
			@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;

			// 备注
			@Column(name = "b_remark")
			private String remark;

			// 创建时间
			@JoinColumn(name = "b_createtime")
			@org.yeshi.utils.mybatis.Column(name = "b_createtime")
			@Column(name = "b_createtime")
			private Date createtime;

			// 更新时间
			@JoinColumn(name = "b_updatetime")
			@org.yeshi.utils.mybatis.Column(name = "b_updatetime")
			@Column(name = "b_updatetime")
			private Date updatetime;

			// 背景图片
			private String bottomPicture;

			// 是否删除图片
			private Boolean delIcon;
			private Boolean delPicture;
			private Boolean delSubPicture;

			// 是否弹框
			@Expose
			private boolean elastic;


			public Long getId() {
			@@ -163,4 +213,116 @@
			this.updatetime = updatetime;
			}

			public Long getCardId() {
			return cardId;
			}

			public void setCardId(Long cardId) {
			this.cardId = cardId;
			}

			public Long getState() {
			return state;
			}

			public void setState(Long state) {
			this.state = state;
			}

			public String getShowType() {
			return showType;
			}

			public void setShowType(String showType) {
			this.showType = showType;
			}

			public String getRemark() {
			return remark;
			}

			public void setRemark(String remark) {
			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;
			}

			}