From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
index 706d8c7..7300971 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
@@ -91,6 +91,9 @@
/**
* 鍏辫鍥㈣垂
+ *
+ *
+ *
*/
private Double groupTotal;
@@ -99,11 +102,17 @@
*/
private Double totalPrice;
+ private String spee;
+
/**
* 鍒涘缓鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
}
--
Gitblit v1.9.1