From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java b/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java
index 19ee798..8f98679 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java
@@ -29,6 +29,26 @@
 	private Date updateTime;
 	@Column(name = "da_ip")
 	private String ipInfo;
+	@Column(name = "da_channel")
+	private String channel;// 娓犻亾
+	@Column(name = "da_imei")
+	private String imei;
+
+	public String getImei() {
+		return imei;
+	}
+
+	public void setImei(String imei) {
+		this.imei = imei;
+	}
+
+	public String getChannel() {
+		return channel;
+	}
+
+	public void setChannel(String channel) {
+		this.channel = channel;
+	}
 
 	public String getIpInfo() {
 		return ipInfo;

--
Gitblit v1.8.0