From 03df72155ccd47912384b3e5f3fceb7331e377de Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 13 九月 2024 14:48:49 +0800
Subject: [PATCH] 2024-09-13 朱宝民 优化获取交易明细记录，余额改为操作表余额，返回字段增加收银员姓名及分页参数
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
index 313bc5c..4419eac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
@@ -41,6 +41,18 @@
public Long id;
/**
+ * 鍐滄埛瀹炰綋ID锛堝閿級
+ */
+ @Schema(description = "鍐滄埛瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ @Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String clientName;
+ /**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -260,7 +272,7 @@
this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
//this.orderNo = cdData.orderNo ;
- //this.icCardAddr = cdData.icCardAddr ;
+ this.icCardAddr = cdData.cardAddr ;
this.icCardNo = cdData.cardNo ;
//this.waterLevel = cdData.waterLevel ;
//this.waterPress = cdData.waterPress ;
--
Gitblit v1.8.0