From df4441322e9801c102299451da41d7c40b4502e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 六月 2021 18:53:13 +0800
Subject: [PATCH] zookeeper地址修改，Maven采用私服
---
facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java | 75 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java b/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
index 3af8eaa..1b8e092 100644
--- a/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
+++ b/facade-lucky/src/main/java/com/ks/lucky/pojo/DO/LuckyActivity.java
@@ -1,8 +1,8 @@
package com.ks.lucky.pojo.DO;
import org.springframework.data.annotation.Transient;
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
import javax.validation.Valid;
import javax.validation.constraints.NotEmpty;
@@ -15,6 +15,7 @@
@Valid
public class LuckyActivity implements Serializable {
+ private static final long serialVersionUID = 1L;
//鏈彁浜ゅ鏍�
public final static int STATE_NOT_SUBMIT_VERIFY = -2;
@@ -46,75 +47,73 @@
//宸插紑濂栵紝宸茬粡鏄剧ず
public final static int STATE_OPENED = 41;
+ //寮�濂栧け璐�
+ public final static int STATE_OPEN_FAIL = 42;
- @Column(name="id")
+
+ @Column(name = "id")
private Long id;
- @Column(name="app_id")
+ @Column(name = "app_id")
@NotNull(message = "搴旂敤ID涓嶈兘涓虹┖")
private Long appId;
- @Column(name="sponsor_id")
+ @Column(name = "sponsor_id")
@NotNull(message = "璧炲姪鍟嗕笉鑳戒负绌�")
private Long sponsorId;
- @Column(name="`name`")
+ @Column(name = "`name`")
@NotEmpty(message = "娲诲姩鍚嶇О涓嶈兘涓虹┖")
private String name;
- @Column(name="material_poster")
+ @Column(name = "material_poster")
@NotEmpty(message = "娲诲姩娴锋姤涓嶈兘涓虹┖")
private String materialPoster;
- @Column(name="material_tag_image")
+ @Column(name = "material_tag_image")
private String materialTagImage;
- @Column(name="material_")
+ @Column(name = "material_")
private String material;
- @Column(name="`desc`")
+ @Column(name = "`desc`")
private String desc;
/**
* 鏈�澶т汉鏁�
*/
- @Column(name="max_person_count")
+ @Column(name = "max_person_count")
private Integer maxPersonCount;
/**
* 鐜版湁浜烘暟
*/
- @Column(name="current_person_count")
+ @Column(name = "current_person_count")
private Integer currentPersonCount;
- @Column(name="`state`")
+ @Column(name = "`state`")
private Integer state;
- @Column(name="state_remarks")
+ @Column(name = "state_remarks")
private String stateRemarks;
- @Column(name="pre_start_time")
+ @Column(name = "pre_start_time")
@NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
private Date preStartTime;
- @Column(name="actual_start_time")
+ @Column(name = "actual_start_time")
private Date actualStartTime;
- @Column(name="pre_finish_time")
+ @Column(name = "pre_finish_time")
private Date preFinishTime;
- @Column(name="actual_finish_time")
+ @Column(name = "actual_finish_time")
private Date actualFinishTime;
- @Column(name="pre_open_time")
- private Date preOpenTime;
- @Column(name="actual_open_time")
- private Date actualOpenTime;
-
- @Column(name="create_time")
+ @Column(name = "create_time")
private Date createTime;
- @Column(name="update_time")
+ @Column(name = "update_time")
private Date updateTime;
@Transient
@@ -129,6 +128,17 @@
//寮�濂栦俊鎭�
private LuckyActivityOpenInfo openInfo;
+ //banner鍥剧墖
+ @Transient
+ private List<LuckyActivityImage> bannerList;
+
+ public List<LuckyActivityImage> getBannerList() {
+ return bannerList;
+ }
+
+ public void setBannerList(List<LuckyActivityImage> bannerList) {
+ this.bannerList = bannerList;
+ }
public List<LuckyActivityAwards> getAwardsList() {
return awardsList;
@@ -186,13 +196,6 @@
this.sponsorId = sponsorId;
}
- public Date getActualOpenTime() {
- return actualOpenTime;
- }
-
- public void setActualOpenTime(Date actualOpenTime) {
- this.actualOpenTime = actualOpenTime;
- }
public String getName() {
return name;
@@ -256,14 +259,6 @@
public void setStateRemarks(String stateRemarks) {
this.stateRemarks = stateRemarks == null ? null : stateRemarks.trim();
- }
-
- public Date getPreOpenTime() {
- return preOpenTime;
- }
-
- public void setPreOpenTime(Date preOpenTime) {
- this.preOpenTime = preOpenTime;
}
public Date getCreateTime() {
--
Gitblit v1.8.0