From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java
index cd84067..b775567 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java
@@ -12,9 +12,16 @@
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import org.springframework.format.annotation.DateTimeFormat;
+
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+/**
+ * 杞挱鍥� 鍥剧墖绠＄悊
+ * @author Administrator
+ *
+ */
@Entity
@Table(name = "yeshi_ec_swiper_banner_picture")
@org.yeshi.utils.mybatis.Table("yeshi_ec_swiper_banner_picture")
@@ -28,26 +35,42 @@
@org.yeshi.utils.mybatis.Column(name = "pic_id")
private Long id;
+ // 杞挱鍥炬爣璇咺D
@JoinColumn(name = "pic_banner_id")
@org.yeshi.utils.mybatis.Column(name = "pic_banner_id")
private Long bannerId;
+ // 鍥剧墖閾炬帴
@Expose
@JoinColumn(name = "pic_src")
@org.yeshi.utils.mybatis.Column(name = "pic_src")
private String src;
+ // 璺宠浆鏂瑰紡
@Expose
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "pic_jumpid")
@org.yeshi.utils.mybatis.Column(name = "pic_jumpid")
private JumpDetailV2 jumpDetail;
-
+
+ // 璺宠浆鍙傛暟
@Expose
@JoinColumn(name = "pic_params")
@org.yeshi.utils.mybatis.Column(name = "pic_params")
private String params;
+
+ // 璺宠浆鏄惁闇�瑕佺櫥闄�
+ @JoinColumn(name = "pic_jump_need_login")
+ @org.yeshi.utils.mybatis.Column(name = "pic_jump_need_login")
+ private boolean jumpNeedLogin;
+
+ // 鏄剧ず鐘舵�侊細everyday姣忓ぉ灞曠ず涓�娆� 銆乤lways 姣忔鎵撳紑棣栭〉閮藉睍绀�
+ @Expose
+ @JoinColumn(name = "pic_show_state")
+ @org.yeshi.utils.mybatis.Column(name = "pic_show_state")
+ private String showState;
+ // 鎺掑簭
@JoinColumn(name = "pic_order")
@org.yeshi.utils.mybatis.Column(name = "pic_order")
private Integer order;
@@ -56,9 +79,28 @@
@org.yeshi.utils.mybatis.Column(name = "pic_remark")
private String remark;
+ // 鍚敤鐘舵��
@JoinColumn(name = "pic_state")
@org.yeshi.utils.mybatis.Column(name = "pic_state")
private Integer state;
+
+ // 鑷姩鎺у埗
+ @JoinColumn(name = "pic_auto_control")
+ @org.yeshi.utils.mybatis.Column(name = "pic_auto_control")
+ private Integer autoControl;
+
+
+ // 璧峰鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JoinColumn(name = "pic_start_time")
+ @org.yeshi.utils.mybatis.Column(name = "pic_start_time")
+ private Date startTime;
+
+ // 缁撴潫鏃堕棿
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JoinColumn(name = "pic_end_time")
+ @org.yeshi.utils.mybatis.Column(name = "pic_end_time")
+ private Date endTime;
@JoinColumn(name = "pic_createtime")
@org.yeshi.utils.mybatis.Column(name = "pic_createtime")
@@ -147,4 +189,46 @@
public void setParams(String params) {
this.params = params;
}
+
+ public Integer getAutoControl() {
+ return autoControl;
+ }
+
+ public void setAutoControl(Integer autoControl) {
+ this.autoControl = autoControl;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public boolean isJumpNeedLogin() {
+ return jumpNeedLogin;
+ }
+
+ public void setJumpNeedLogin(boolean jumpNeedLogin) {
+ this.jumpNeedLogin = jumpNeedLogin;
+ }
+
+ public String getShowState() {
+ return showState;
+ }
+
+ public void setShowState(String showState) {
+ this.showState = showState;
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0