From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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 c015d84..edaefdd 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;
@@ -45,10 +46,20 @@
@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;
+
/**
* 琛岀▼鍦扮偣
*/
private String address;
+
+ private String scenic;
/**
* 闂ㄧエ璐�
@@ -74,6 +85,10 @@
* 浜ら�氳垂
*/
private Double travel;
+ /**
+ * 璐墿璐�
+ */
+ private Double shop;
/**
* 鐢靛瓙鏂囦欢璺緞
@@ -95,5 +110,13 @@
*/
private String document;
+ private Double otherCost;
+
+ private String backInfo;
+
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1