From a39807064a500875d89bc46edcd2d0b3654575a9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 24 七月 2024 15:14:46 +0800
Subject: [PATCH] 取水口日取水量漏损（历史） 取水口日取水量漏损（最新） 修改控制器报警与状态查询的排序、 修改农户日用水量统计的排序、日期类型 重构代码放置结构
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 7940161..3caef8d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -20,6 +20,15 @@
public class VoTradeDetails implements BaseEntity {
private static final long serialVersionUID = 202402012040001L;
+ @Schema(title = "鏀堕摱鍛業D")
+ private String cashierId;
+
+ @Schema(title = "鍖哄垝鍚嶇О涓�")
+ private String districtTitle;
+
+ @Schema(title = "鏉戝簞ID")
+ private String villageId;
+
@Schema(title = "鍐滄埛濮撳悕")
private String clientName;
@@ -35,11 +44,23 @@
@Schema(title = "浜ゆ槗閲戦")
private Double tradeAmount;
+ @Schema(title = "璐按閲戦")
+ private Double waterCost;
+
+ @Schema(title = "璐崱閲戦")
+ private Double cardCost;
+
+ @Schema(title = "璧犻�侀噾棰�")
+ private Double gift;
+
+ @Schema(title = "杩斿洖閲戦")
+ private Double refundAmount;
+
@Schema(title = "浠樻鏂瑰紡")
private String paymentName;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "浜ゆ槗鏃堕棿")
- private Date tradeDate;
+ private Date tradeTime;
}
--
Gitblit v1.8.0