From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 03 九月 2019 17:04:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 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 95c0753..b66c998 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 @@ -111,6 +111,14 @@ @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; + // 鍒涘缓鏃堕棿 @Column(name = "b_createtime") private Date createtime; @@ -119,17 +127,21 @@ @Column(name = "b_updatetime") private Date updatetime; + + // 鏄惁寮规 + @Expose + private boolean elastic; + + // 鑳屾櫙鍥剧墖 private String bottomPicture; - // 鏄惁鍒犻櫎鍥剧墖 private Boolean delIcon; private Boolean delPicture; private Boolean delSubPicture; - // 鏄惁寮规 - @Expose - private boolean elastic; + // 闄愬埗鏈�浣庣増鏈� + private String version; public Long getId() { @@ -324,5 +336,28 @@ public void setOrderWoman(Integer orderWoman) { 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; + } + + public void setVersion(String version) { + this.version = version; + } } -- Gitblit v1.8.0