From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级

---
 fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceActive.java |  253 +++++++++++++++++++++++++++++---------------------
 1 files changed, 148 insertions(+), 105 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..09d8197 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
@@ -1,105 +1,148 @@
-package com.yeshi.fanli.entity.push;
-
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-@Table("yeshi_ec_device_active")
-public class DeviceActive {
-
-	public static final int PLATFORM_ANDROID = 1;
-	public static final int PLATFORM_IOS = 2;
-
-	@Column(name = "da_id")
-	private Long id;
-	@Column(name = "da_platform")
-	private Integer platform;
-	@Column(name = "da_device")
-	private String device;
-	@Column(name = "da_device_token_md5")
-	private String deviceTokenMd5;
-	@Column(name = "da_device_token")
-	private String deviceToken;
-	@Column(name = "da_version_code")
-	private Integer versionCode;
-	@Column(name = "da_createtime")
-	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;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Integer getPlatform() {
-		return platform;
-	}
-
-	public void setPlatform(Integer platform) {
-		this.platform = platform;
-	}
-
-	public String getDevice() {
-		return device;
-	}
-
-	public void setDevice(String device) {
-		this.device = device;
-	}
-
-	public String getDeviceTokenMd5() {
-		return deviceTokenMd5;
-	}
-
-	public void setDeviceTokenMd5(String deviceTokenMd5) {
-		this.deviceTokenMd5 = deviceTokenMd5;
-	}
-
-	public String getDeviceToken() {
-		return deviceToken;
-	}
-
-	public void setDeviceToken(String deviceToken) {
-		this.deviceToken = deviceToken;
-	}
-
-	public Integer getVersionCode() {
-		return versionCode;
-	}
-
-	public void setVersionCode(Integer versionCode) {
-		this.versionCode = versionCode;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-}
+package com.yeshi.fanli.entity.push;
+
+import java.util.Date;
+
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+@Table("yeshi_ec_device_active")
+public class DeviceActive {
+
+	public static final int PLATFORM_ANDROID = 1;
+	public static final int PLATFORM_IOS = 2;
+	public static final int PLATFORM_WXMP = 4;//寰俊灏忕▼搴�
+
+	@Column(name = "da_id")
+	private Long id;
+	@Column(name = "da_platform")
+	private Integer platform;
+	@Column(name = "da_device")
+	private String device;
+	@Column(name = "da_device_token_md5")
+	private String deviceTokenMd5;
+	@Column(name = "da_device_token")
+	private String deviceToken;
+	@Column(name = "da_version_code")
+	private Integer versionCode;
+	@Column(name = "da_createtime")
+	private Date createTime;
+	@Column(name = "da_updatetime")
+	private Date updateTime;
+	@Column(name = "da_ip")
+	private String ipInfo;
+	@Column(name = "da_channel")
+	private String channel;// 娓犻亾
+	@Column(name = "da_imei")
+	private String imei;
+	
+	@Column(name = "da_idfa")
+	private String idfa;
+	
+	@Column(name = "da_mac")
+	private String mac;
+
+	public String getIdfa() {
+		return idfa;
+	}
+
+	public void setIdfa(String idfa) {
+		this.idfa = idfa;
+	}
+
+	public String getMac() {
+		return mac;
+	}
+
+	public void setMac(String mac) {
+		this.mac = mac;
+	}
+
+	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;
+	}
+
+	public void setIpInfo(String ipInfo) {
+		this.ipInfo = ipInfo;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getPlatform() {
+		return platform;
+	}
+
+	public void setPlatform(Integer platform) {
+		this.platform = platform;
+	}
+
+	public String getDevice() {
+		return device;
+	}
+
+	public void setDevice(String device) {
+		this.device = device;
+	}
+
+	public String getDeviceTokenMd5() {
+		return deviceTokenMd5;
+	}
+
+	public void setDeviceTokenMd5(String deviceTokenMd5) {
+		this.deviceTokenMd5 = deviceTokenMd5;
+	}
+
+	public String getDeviceToken() {
+		return deviceToken;
+	}
+
+	public void setDeviceToken(String deviceToken) {
+		this.deviceToken = deviceToken;
+	}
+
+	public Integer getVersionCode() {
+		return versionCode;
+	}
+
+	public void setVersionCode(Integer versionCode) {
+		this.versionCode = versionCode;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+}

--
Gitblit v1.8.0