From 6a90de16db3c98d2c7e37cbd61f8ff22d495b23a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 04 九月 2019 15:33:13 +0800
Subject: [PATCH] 专题修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 103 +++++++++++++++++++++++++--------------------------
1 files changed, 50 insertions(+), 53 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 b66c998..6dab052 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
@@ -25,16 +25,15 @@
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; // 鐢�+濂�+閫氱敤
-
+ 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")
private Long id;
@@ -52,17 +51,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")
@@ -81,43 +80,43 @@
// 璺宠浆鏄惁闇�瑕佺櫥褰�
@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;
-
+
// 澶囨敞
@Column(name = "b_remark")
private String remark;
-
- // 骞冲彴锛�1-android 2-IOS
- @Column(name = "b_platform")
- private Integer platform;
-
- // 鐗堟湰鍙�
- @Column(name = "b_version_code")
- private Integer versionCode;
+
+ // 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_createtime")
@@ -126,23 +125,20 @@
// 鏇存柊鏃堕棿
@Column(name = "b_updatetime")
private Date updatetime;
-
-
+
// 鏄惁寮规
@Expose
private boolean elastic;
-
-
+
// 鑳屾櫙鍥剧墖
- private String bottomPicture;
+ private String bottomPicture;
// 鏄惁鍒犻櫎鍥剧墖
private Boolean delIcon;
private Boolean delPicture;
private Boolean delSubPicture;
-
+
// 闄愬埗鏈�浣庣増鏈�
- private String version;
-
+ private String version;
public Long getId() {
return id;
@@ -167,7 +163,6 @@
public void setCard(String card) {
this.card = card;
}
-
public String getPicture() {
return picture;
@@ -234,6 +229,7 @@
}
public Long getState() {
+
return state;
}
@@ -337,22 +333,6 @@
this.orderWoman = orderWoman;
}
- public Integer getPlatform() {
- return platform;
- }
-
- public void setPlatform(Integer platform) {
- this.platform = platform;
- }
-
- public Integer getVersionCode() {
- return versionCode;
- }
-
- public void setVersionCode(Integer versionCode) {
- this.versionCode = versionCode;
- }
-
public String getVersion() {
return version;
}
@@ -360,4 +340,21 @@
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;
+ }
+
}
--
Gitblit v1.8.0