From db9e568e346c07b574c5fbe59041889309f0642c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 29 五月 2023 22:09:30 +0800
Subject: [PATCH] 123

---
 zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java |  127 ++++++++++++++----------------------------
 1 files changed, 43 insertions(+), 84 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java
index 2ee9618..e229f1f 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZTravelBase.java
@@ -1,9 +1,15 @@
 package com.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -14,138 +20,91 @@
  * @since 2023-03-14
  */
 @TableName("z_travel_base")
+@Data
 public class ZTravelBase implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
+
+    /**
+     * 瀵瑰簲璐圭敤琛╥d
+     */
+    private String feeId;
 
     /**
      * 鍦扮偣
      */
+    @Excel(name = "鍦扮偣")
     private String address;
 
     /**
      * 鎵�鏈夊弬鍔犳湰娆℃梾琛岀殑浜虹墿锛岀敤閫楀彿闅斿紑
      */
+    @Excel(name = "浜虹墿")
     private String people;
 
     /**
      * 鏃呰璁板綍鐨勬爣棰�
      */
+    @Excel(name = "鏍囬")
     private String title;
 
     /**
      * 鏃呮湡
      */
+    @Excel(name = "鏃呮湡")
     private String travelPeriod;
 
     /**
      * 鎵�鎸佺殑璇佷欢锛屽涓敤閫楀彿闅斿紑
      */
+    @Excel(name = "鎵�鎸佽瘉浠�")
     private String certificate;
 
     /**
      * 鏈鏃呰鎬昏垂鐢�
      */
+    @Excel(name = "鎬昏垂鐢�")
     private Double totalPrice;
 
     /**
      * 0锛氬叕璐癸紝1锛氳嚜璐�
      */
-    private Integer isSelf;
+    @Excel(name = "鍏垂鎴栬嚜璐�", readConverterExp = "0=鍏垂,1=鑷垂")
+    private Integer self;
 
     /**
      * 澶囨敞淇℃伅
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
+    /**
+     * 鍙戠敓鏃堕棿
+     */
+    @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date happenTime;
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(exist = false)
+    private Date happenStartTime;
 
-    public String getAddress() {
-        return address;
-    }
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(exist = false)
+    private Date happenEndTime;
 
-    public void setAddress(String address) {
-        this.address = address;
-    }
+    /**
+     * 鐢靛瓙鏂囦欢璺緞
+     */
+    private String url;
 
-    public String getPeople() {
-        return people;
-    }
-
-    public void setPeople(String people) {
-        this.people = people;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getTravelPeriod() {
-        return travelPeriod;
-    }
-
-    public void setTravelPeriod(String travelPeriod) {
-        this.travelPeriod = travelPeriod;
-    }
-
-    public String getCertificate() {
-        return certificate;
-    }
-
-    public void setCertificate(String certificate) {
-        this.certificate = certificate;
-    }
-
-    public Double getTotalPrice() {
-        return totalPrice;
-    }
-
-    public void setTotalPrice(Double totalPrice) {
-        this.totalPrice = totalPrice;
-    }
-
-    public Integer getIsSelf() {
-        return isSelf;
-    }
-
-    public void setIsSelf(Integer isSelf) {
-        this.isSelf = isSelf;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "ZTravelBase{" +
-        "id=" + id +
-        ", address=" + address +
-        ", people=" + people +
-        ", title=" + title +
-        ", travelPeriod=" + travelPeriod +
-        ", certificate=" + certificate +
-        ", totalPrice=" + totalPrice +
-        ", isSelf=" + isSelf +
-        ", remark=" + remark +
-        "}";
-    }
 }

--
Gitblit v1.9.1