From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java |   86 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
index 1d1e441..b9e98e4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java
@@ -26,7 +26,24 @@
 	
 	// 灞曠ず浣嶇疆 -棣栭〉
 	public static String POSITION_INDEX = "index";
+	// 灞曠ず浣嶇疆 - 娑堟伅涓績
+	public static String POSITION_MSGCENTER = "msgCenter";
 	
+	public enum FloatADTypeEnum {
+		activity("娲诲姩"), newUserRedPack("鏂颁汉绾㈠寘");
+		private final String desc;
+
+		private FloatADTypeEnum(String desc) {
+			this.desc = desc;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+	}
+	
+	
+		
 	
 	@Column(name = "fa_id")
 	private Long id;
@@ -61,12 +78,12 @@
 	private boolean jumpNeedLogin;
 
 	// 璧峰鏃堕棿
-	@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@Column(name = "fa_start_time")
 	private Date startTime;
 
 	// 缁撴潫鏃ユ湡
-	@DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@Column(name = "fa_end_time")
 	private Date endTime;
 
@@ -77,10 +94,20 @@
 	// 鎺掑簭-浼樺厛鏉�
 	@Column(name = "fa_order")
 	private Integer order;
+	
+	// 閫傜敤绫诲瀷 锛� 0閫氱敤  1鏂颁汉
+	@Column(name = "fa_type")
+	private Integer type;
 
+	@Column(name = "fa_type_enum")
+	private FloatADTypeEnum typeEnum;
+	
 	// 鍚敤鐘舵��
 	@Column(name = "fa_state")
 	private Integer state;
+	
+	@Column(name = "fa_play_sound")
+	private Boolean playSound;//鏄惁鎾斁闊虫晥
 
 	// 鍒涘缓鏃堕棿
 	@Column(name = "fa_create_time")
@@ -90,7 +117,13 @@
 	@Column(name = "fa_update_time")
 	private Date updateTime;
 
+	// 璧峰鏃堕棿
+	private String startTime_str;
+	// 缁撴潫鏃堕棿
+	private String endTime_str;
 	
+	// 缁撴潫鏃堕棿
+	private String typeName;
 	
 	
 	public Long getId() {
@@ -204,4 +237,53 @@
 	public void setShowMode(String showMode) {
 		this.showMode = showMode;
 	}
+
+	public String getStartTime_str() {
+		return startTime_str;
+	}
+
+	public void setStartTime_str(String startTime_str) {
+		this.startTime_str = startTime_str;
+	}
+
+	public String getEndTime_str() {
+		return endTime_str;
+	}
+
+	public void setEndTime_str(String endTime_str) {
+		this.endTime_str = endTime_str;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
+	public Boolean getPlaySound() {
+		return playSound;
+	}
+
+	public void setPlaySound(Boolean playSound) {
+		this.playSound = playSound;
+	}
+
+	public FloatADTypeEnum getTypeEnum() {
+		return typeEnum;
+	}
+
+	public void setTypeEnum(FloatADTypeEnum typeEnum) {
+		this.typeEnum = typeEnum;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+	
 }

--
Gitblit v1.8.0