From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java |   10 ++++++++++
 1 files changed, 10 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 e2a5490..19ee798 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
@@ -27,6 +27,16 @@
 	private Date createTime;
 	@Column(name = "da_updatetime")
 	private Date updateTime;
+	@Column(name = "da_ip")
+	private String ipInfo;
+
+	public String getIpInfo() {
+		return ipInfo;
+	}
+
+	public void setIpInfo(String ipInfo) {
+		this.ipInfo = ipInfo;
+	}
 
 	public Long getId() {
 		return id;

--
Gitblit v1.8.0