From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenHW.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenHW.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenHW.java
index 27aa0e3..dd2b513 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenHW.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenHW.java
@@ -18,6 +18,8 @@
private Long id;
@Column(name = "dh_token")
private String deviceToken;
+ @Column(name = "dh_token_md5")
+ private String deviceTokenMd5;
@Column(name = "dh_device")
private String device;
@Column(name = "dh_uid")
@@ -64,4 +66,13 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public String getDeviceTokenMd5() {
+ return deviceTokenMd5;
+ }
+
+ public void setDeviceTokenMd5(String deviceTokenMd5) {
+ this.deviceTokenMd5 = deviceTokenMd5;
+ }
+
}
--
Gitblit v1.8.0