From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
index c28cbb7..6854e25 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
@@ -1,9 +1,10 @@
package com.ruoyi.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
import java.io.Serializable;
import java.util.Date;
@@ -44,6 +45,14 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date happenDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date happenStartTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date happenEndTime;
/**
* 琛岀▼鍦扮偣
@@ -97,5 +106,13 @@
*/
private String document;
+ private Double otherCost;
+
+ private String backInfo;
+
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1