fanli-server.git

			@@ -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;
			}

			}