From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 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 8e18410..ad0bcda 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
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.entity.bus.homemodule;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import org.springframework.format.annotation.DateTimeFormat;
@@ -16,8 +17,12 @@
  *
  */
 @Table("yeshi_ec_float_ad")
-public class FloatAD {
+public class FloatAD implements Serializable{
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	// 姣忓ぉ灞曠ず涓�娆�
 	public static String MODE_ONCE_DAY = "everyday";
 	// 姣忔鎵撳紑棣栭〉閮藉睍绀�
@@ -26,7 +31,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;
@@ -77,10 +99,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")
@@ -95,6 +127,8 @@
 	// 缁撴潫鏃堕棿
 	private String endTime_str;
 	
+	// 缁撴潫鏃堕棿
+	private String typeName;
 	
 	
 	public Long getId() {
@@ -224,6 +258,37 @@
 	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