From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码； 2、删除global模块中一些无用的备份； 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false)，防止编译时警告
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index 85e6741..c8510df 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -197,6 +197,12 @@
public Integer clThisTime;
/**
+ * 鍏抽榾鎶ヤ腑姘翠环
+ */
+ @Schema(description = "鍏抽榾鎶ヤ腑姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double clPrice ;//姘翠环
+
+ /**
* 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
*/
@Schema(description = "鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -248,6 +254,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -267,6 +274,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);
@@ -296,6 +304,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -316,6 +325,7 @@
this.clThisAmount = cdData.thisWater;
this.clThisMoney = cdData.thisMoney;
this.clThisTime = cdData.thisDuration;
+ this.clPrice = null;
this.clOrderNo = cdData.orderNo;
this.clEleTotalAmount = cdData.eleTotalAmount;
this.clWaterRemainUser = cdData.waterRemain;
@@ -340,6 +350,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -361,6 +372,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
--
Gitblit v1.8.0