From 1837720b1fcc164e594df34f8590a594dfa2a8e0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:35:14 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java
index 0fcc000..0ff9e2e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java
@@ -25,8 +25,15 @@
@Column(name = "device_token")
private String deviceToken;
+ @Column(name = "device_token_md5")
+ private String deviceTokenMd5;
+
@Column(name = "device")
private String device;
+
+ // 鐗堟湰鍙�
+ @Column(name = "version")
+ private Integer version;
@Column(name = "createtime")
private Date createTime;
@@ -42,6 +49,14 @@
this.id = id;
}
+ public String getDeviceTokenMd5() {
+ return deviceTokenMd5;
+ }
+
+ public void setDeviceTokenMd5(String deviceTokenMd5) {
+ this.deviceTokenMd5 = deviceTokenMd5;
+ }
+
public Long getUid() {
return uid;
}
@@ -50,6 +65,14 @@
this.uid = uid;
}
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
public String getDeviceToken() {
return deviceToken;
}
--
Gitblit v1.8.0