From f1aa196ca63b8c287c5af61214881259c13db69b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 11 九月 2019 15:48:05 +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/common/Config.java | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/common/Config.java b/fanli/src/main/java/com/yeshi/fanli/entity/common/Config.java
index 45d8624..d4d1930 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/common/Config.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/common/Config.java
@@ -2,44 +2,76 @@
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-//绯荤粺鎬婚厤锟�?
-@Entity
-@Table(name = "`yeshi_ec_config`")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_config")
-public class Config implements Serializable{
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+@Table("yeshi_ec_config")
+public class Config implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
- @Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "id")
- @org.yeshi.utils.mybatis.Column(name="id")
private Long id;
- @Column(name = "`key`", length = 32)
- @org.yeshi.utils.mybatis.Column(name="key")
+ @Column(name = "key")
private String key;
- @Column(name = "`value`", length = 4096)
- @org.yeshi.utils.mybatis.Column(name="value")
+ @Column(name = "value")
private String value;
- @Column(name = "`name`", length = 1024)
- @org.yeshi.utils.mybatis.Column(name="name")
+ @Column(name = "name")
private String name;
- @Column(name = "`beizhu`", length = 1024)
- @org.yeshi.utils.mybatis.Column(name="beizhu")
+ @Column(name = "beizhu")
private String beizhu;
-
- @Column(name = "`createtime`", length = 16)
- @org.yeshi.utils.mybatis.Column(name="createtime")
+ @Column(name = "createtime")
private String createtime;
+ @Column(name = "min_android_version")
+ private Integer minAndroidVersionCode;// android鏈�灏忕増鏈�
+ @Column(name = "min_ios_version")
+ private Integer minIosVersionCode;// ios鏈�灏忕増鏈�
+
+ //鍚庡彴灞曠幇
+ private String minAndroidVersion;
+
+ private String minIosVersion;
+
+
+
+ public String getMinAndroidVersion() {
+ return minAndroidVersion;
+ }
+
+ public void setMinAndroidVersion(String minAndroidVersion) {
+ this.minAndroidVersion = minAndroidVersion;
+ }
+
+ public String getMinIosVersion() {
+ return minIosVersion;
+ }
+
+ public void setMinIosVersion(String minIosVersion) {
+ this.minIosVersion = minIosVersion;
+ }
+
+ 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;
+ }
+
public Long getId() {
return id;
}
--
Gitblit v1.8.0