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/TravelCount.java | 12 ++++++++++++ 1 files changed, 12 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 f135cf3..f340cd3 100644 --- a/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java +++ b/zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java @@ -90,7 +90,15 @@ private Double eatTotal; /** + * 鍏辫璐墿璐� + */ + private Double shopTotal; + + /** * 鍏辫鍥㈣垂 + * + * + * */ private Double groupTotal; @@ -107,5 +115,9 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date createTime; + /** + * 鍒嗕韩浜篿d + */ + private Integer shareId; } -- Gitblit v1.9.1