From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 19:19:35 +0800
Subject: [PATCH] 1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
index 190160a..7f700da 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveLast.java
@@ -333,7 +333,7 @@
         this.clThisAmount = null;
         this.clThisMoney = null;
         this.clThisTime = null;
-        this.clPrice = null;
+        this.clPrice = cdData.price;
         this.clOpenDt = null;
         this.closeDt = null;
 
@@ -355,7 +355,7 @@
         this.clThisAmount = cdData.thisWater;
         this.clThisMoney = cdData.thisMoney;
         this.clThisTime = cdData.thisDuration;
-        this.clPrice = null;
+        this.clPrice = cdData.price;
         this.clOrderNo = cdData.orderNo;
         this.clEleTotalAmount = cdData.eleTotalAmount;
         this.clWaterRemainUser = cdData.waterRemain;
@@ -463,7 +463,7 @@
         this.clThisMoney = cdData.thisMoney;
         this.clThisTime = cdData.thisDuration;
         this.clThisEle = cdData.thisEle;
-        this.clPrice = null;
+        this.clPrice = cdData.price;
         this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.startDt);
         this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.endDt) ;
 

--
Gitblit v1.8.0