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 | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 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 db2cf8b..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
@@ -21,14 +21,7 @@
private static final long serialVersionUID = 1L;
- // 鍦嗗舰
- public static String SHOWTYPE_ARC = "arc";
- // 鏂瑰潡
- public static String SHOWTYPE_BLOCK = "block";
- // 娲诲姩
- public static String SHOWTYPE_ACTIVITY = "activity";
-
-
+ @Expose
@Column(name = "b_id")
private Long id;
@@ -46,11 +39,15 @@
@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
@@ -67,6 +64,10 @@
@Column(name = "b_params")
private String params;
+ // 璺宠浆鏄惁闇�瑕佺櫥褰�
+ @Column(name = "b_jump_login")
+ private boolean jumpLogin;
+
// 鎺掑簭
@Column(name = "b_orderby")
private Integer orderby;
@@ -92,6 +93,13 @@
@Column(name = "b_updatetime")
private Date updatetime;
+ // 鑳屾櫙鍥剧墖
+ private String bottomPicture;
+
+ // 鏄惁鍒犻櫎鍥剧墖
+ private Boolean delIcon;
+ private Boolean delPicture;
+ private Boolean delSubPicture;
public Long getId() {
return id;
@@ -206,4 +214,52 @@
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