From b9e0f06eb30c3b77171cd78b9311758d17400d5b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 06 七月 2024 10:39:31 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java |    2 +-
 1 files changed, 1 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..054d6b8 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
@@ -260,7 +260,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