From b7a90c576ac6b482c68ad6d0c2777831f9127b4a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 16:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 2b76e68..c159de0 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
@@ -17,7 +17,7 @@
*/
@Table("yeshi_ec_swiper_banner_picture")
public class SwiperPicture implements Serializable {
-
+
private static final long serialVersionUID = 1L;
@Expose
@@ -37,16 +37,16 @@
@Expose
@Column(name = "pic_jumpid")
private JumpDetailV2 jumpDetail;
-
+
// 璺宠浆鍙傛暟
@Expose
@Column(name = "pic_params")
private String params;
-
+
// 璺宠浆鏄惁闇�瑕佺櫥闄�
@Column(name = "pic_jump_need_login")
private boolean jumpNeedLogin;
-
+
// 鎺掑簭
@Column(name = "pic_order")
private Integer order;
@@ -61,12 +61,12 @@
// 鑷姩鎺у埗
@Column(name = "pic_auto_control")
private Integer autoControl;
-
+
// 璧峰鏃堕棿
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "pic_start_time")
private Date startTime;
-
+
// 缁撴潫鏃堕棿
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "pic_end_time")
@@ -78,13 +78,34 @@
@Column(name = "pic_updatetime")
private Date updatetime;
-
// 璧峰鏃堕棿
private String startTime_str;
// 缁撴潫鏃堕棿
private String endTime_str;
-
+ // 鏍囬
+ @Column(name = "pic_title")
+ private String title;
+ // 绠�浠�
+ @Column(name = "pic_desc")
+ private String desc;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
public Long getId() {
return this.id;
}
--
Gitblit v1.8.0