From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 175 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 137 insertions(+), 38 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 67f6a48..f645862 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,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,65 +16,90 @@
*
* @date 2018骞�10鏈�23鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_special")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_special")
+@Table("yeshi_ec_special")
public class Special implements Serializable {
private static final long serialVersionUID = 1L;
- @Id
+ @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_state")
+ private Long state;
+
+ // 鏄剧ず绫诲瀷锛氬渾褰㈠浘 銆佸ぇ鍥�
+ @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;
public Long getId() {
return id;
@@ -163,4 +182,84 @@
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;
+ }
+
}
--
Gitblit v1.8.0