From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java | 144 +++++++++++++++++++++++++++++++++--------------
1 files changed, 100 insertions(+), 44 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
index 11fc338..0f0db3d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
@@ -2,18 +2,9 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.yeshi.fanli.entity.system.BusinessSystem;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
/**
* 涓撻鏍囪瘑绠＄悊
@@ -22,51 +13,60 @@
*
* @date 2018骞�10鏈�23鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_special_card")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_special_card")
+@Table("yeshi_ec_special_card")
public class SpecialCard implements Serializable{
private static final long serialVersionUID = 1L;
-
- @Id
@Column(name = "cd_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "cd_id")
private Long id;
-
// 鍚嶇О
- @JoinColumn(name = "cd_name")
- @org.yeshi.utils.mybatis.Column(name = "cd_name")
+ @Column(name = "cd_name")
private String name;
- // 鍖归厤鏍囪瘑
- @JoinColumn(name = "cd_card")
- @org.yeshi.utils.mybatis.Column(name = "cd_card")
+ // 鍖归厤鏍囪瘑 (宸插仠鐢� 锛氬吋瀹�1.5.3 浠ュ墠鐗堟湰-鏆備繚鐣�)
+ @Column(name = "cd_card")
private String card;
- // 鍖归厤鏍囪瘑
- @JoinColumn(name = "cd_state")
- @org.yeshi.utils.mybatis.Column(name = "cd_state")
+ // 鍖归厤鏍囪瘑
+ @Column(name = "cd_state")
private Integer state;
+
+ // 浣嶇疆绠＄悊id
+ @Column(name = "cd_place_id")
+ private Long placeId;
+
+ // 鑳屾櫙鍥剧墖
+ @Column(name = "cd_bottom_picture")
+ private String bottomPicture;
+
+ //璧峰鏃堕棿
+ @Column(name = "cd_start_time")
+ private Date startTime;
+
+ //缁撴潫鏃堕棿
+ @Column(name = "cd_end_time")
+ private Date endTime;
// 鍒涘缓鏃堕棿
- @JoinColumn(name = "cd_createtime")
- @org.yeshi.utils.mybatis.Column(name = "cd_createtime")
+ @Column(name = "cd_createtime")
private Date createtime;
// 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
- @JoinColumn(name = "cd_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "cd_updatetime")
+ @Column(name = "cd_updatetime")
private Date updatetime;
- @Transient
+
+ // 鏄惁瀹氭椂
+ private boolean timeTask;
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
+ // 浣嶇疆鍚嶇О
+ private String placeName;
+ // 宸叉湁涓撻鏁伴噺
private Long totalSpecial;
-
- @Transient // 绯荤粺鍏宠仈鍒楄〃
- private List<BusinessSystem> systemList;
-
public Long getId() {
@@ -109,14 +109,6 @@
this.updatetime = updatetime;
}
- public List<BusinessSystem> getSystemList() {
- return systemList;
- }
-
- public void setSystemList(List<BusinessSystem> systemList) {
- this.systemList = systemList;
- }
-
public Long getTotalSpecial() {
return totalSpecial;
}
@@ -131,6 +123,70 @@
public void setState(Integer state) {
this.state = state;
+ }
+
+ public Long getPlaceId() {
+ return placeId;
+ }
+
+ public void setPlaceId(Long placeId) {
+ this.placeId = placeId;
+ }
+
+ public String getBottomPicture() {
+ return bottomPicture;
+ }
+
+ public void setBottomPicture(String bottomPicture) {
+ this.bottomPicture = bottomPicture;
+ }
+
+ 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 isTimeTask() {
+ return timeTask;
+ }
+
+ public void setTimeTask(boolean timeTask) {
+ this.timeTask = timeTask;
+ }
+
+ 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 String getPlaceName() {
+ return placeName;
+ }
+
+ public void setPlaceName(String placeName) {
+ this.placeName = placeName;
}
}
--
Gitblit v1.8.0