From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 191 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 146 insertions(+), 45 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 f28bbeb..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
@@ -3,15 +3,8 @@
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;
@@ -23,92 +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;
// 鍚嶇О
@Expose
- @JoinColumn(name = "b_name")
- @org.yeshi.utils.mybatis.Column(name = "b_name")
+ @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;
// 鏍囪瘑绠＄悊id
@Expose
- @JoinColumn(name = "b_card_id")
- @org.yeshi.utils.mybatis.Column(name = "b_card_id")
+ @Column(name = "b_card_id")
private Long cardId;
-
// 涓诲浘
@Expose
- @JoinColumn(name = "b_main_picture")
- @org.yeshi.utils.mybatis.Column(name = "b_main_picture")
+ @Column(name = "b_main_picture")
private String picture;
+
+ // 瑁呴グ鍥�
+ @Expose
+ @Column(name = "b_icon")
+ private String icon;
// 闄勫浘
@Expose
- @JoinColumn(name = "b_sub_picture")
- @org.yeshi.utils.mybatis.Column(name = "b_sub_picture")
+ @Column(name = "b_sub_picture")
private String subPicture;
// 璺宠浆璇︽儏
@Expose
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "b_jumpid")
- @org.yeshi.utils.mybatis.Column(name = "b_jumpid")
+ @Column(name = "b_jumpid")
private JumpDetailV2 jumpDetail;
// 璺宠浆鍙傛暟
@Expose
- @JoinColumn(name = "b_params")
- @org.yeshi.utils.mybatis.Column(name = "b_params")
+ @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;
+
// 鐘舵��
- @JoinColumn(name = "b_state")
- @org.yeshi.utils.mybatis.Column(name = "b_state")
+ @Column(name = "b_state")
private Long state;
- // 鏄剧ず绫诲瀷
+ // 鎬у埆鍖哄垎
+ @Column(name = "b_sex")
+ private Integer sex;
+
+ // 鏄剧ず绫诲瀷锛氬渾褰㈠浘 銆佸ぇ鍥�
@Expose
- @JoinColumn(name = "b_show_type")
- @org.yeshi.utils.mybatis.Column(name = "b_show_type")
+ @Column(name = "b_show_type")
private String showType;
// 澶囨敞
- @JoinColumn(name = "b_remark")
- @org.yeshi.utils.mybatis.Column(name = "b_remark")
+ @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() {
@@ -224,4 +245,84 @@
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;
+ }
+
}
--
Gitblit v1.8.0