From a525f3faae1d749ccceefeb10612ab59cf4d9c1d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 三月 2019 13:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SwiperPicture.java | 87 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 46 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 5ad55b4..715cf73 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
@@ -3,16 +3,9 @@
import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
import org.springframework.format.annotation.DateTimeFormat;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -22,88 +15,75 @@
* @author Administrator
*
*/
-@Entity
-@Table(name = "yeshi_ec_swiper_banner_picture")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_swiper_banner_picture")
+@Table("yeshi_ec_swiper_banner_picture")
public class SwiperPicture implements Serializable {
private static final long serialVersionUID = 1L;
- @Id
- @javax.persistence.Column(name = "pic_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "pic_id")
+ @Column(name = "pic_id")
private Long id;
// 杞挱鍥炬爣璇咺D
- @JoinColumn(name = "pic_banner_id")
- @org.yeshi.utils.mybatis.Column(name = "pic_banner_id")
+ @Column(name = "pic_banner_id")
private Long bannerId;
// 鍥剧墖閾炬帴
@Expose
- @JoinColumn(name = "pic_src")
- @org.yeshi.utils.mybatis.Column(name = "pic_src")
+ @Column(name = "pic_src")
private String src;
// 璺宠浆鏂瑰紡
@Expose
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "pic_jumpid")
- @org.yeshi.utils.mybatis.Column(name = "pic_jumpid")
+ @Column(name = "pic_jumpid")
private JumpDetailV2 jumpDetail;
// 璺宠浆鍙傛暟
@Expose
- @JoinColumn(name = "pic_params")
- @org.yeshi.utils.mybatis.Column(name = "pic_params")
+ @Column(name = "pic_params")
private String params;
// 璺宠浆鏄惁闇�瑕佺櫥闄�
- @JoinColumn(name = "pic_jump_need_login")
- @org.yeshi.utils.mybatis.Column(name = "pic_jump_need_login")
+ @Column(name = "pic_jump_need_login")
private boolean jumpNeedLogin;
// 鎺掑簭
- @JoinColumn(name = "pic_order")
- @org.yeshi.utils.mybatis.Column(name = "pic_order")
+ @Column(name = "pic_order")
private Integer order;
- @JoinColumn(name = "pic_remark")
- @org.yeshi.utils.mybatis.Column(name = "pic_remark")
+ @Column(name = "pic_remark")
private String remark;
- // 鍚敤鐘舵��
- @JoinColumn(name = "pic_state")
- @org.yeshi.utils.mybatis.Column(name = "pic_state")
+ // 鍚敤鐘舵�� 0 鍚敤1 鍋滅敤
+ @Column(name = "pic_state")
private Integer state;
// 鑷姩鎺у埗
- @JoinColumn(name = "pic_auto_control")
- @org.yeshi.utils.mybatis.Column(name = "pic_auto_control")
+ @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")
+ @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")
+ @Column(name = "pic_end_time")
private Date endTime;
- @JoinColumn(name = "pic_createtime")
- @org.yeshi.utils.mybatis.Column(name = "pic_createtime")
+ @Column(name = "pic_createtime")
private Date createtime;
- @JoinColumn(name = "pic_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "pic_updatetime")
+ @Column(name = "pic_updatetime")
private Date updatetime;
+
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
+
+
public Long getId() {
return this.id;
}
@@ -215,5 +195,20 @@
public void setJumpNeedLogin(boolean jumpNeedLogin) {
this.jumpNeedLogin = jumpNeedLogin;
}
-
+
+ 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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0