From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
index 543e308..bafa458 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/qo/QoRecharge.java
@@ -20,17 +20,20 @@
@Schema(name = "IC鍗″厖鍊艰褰曟煡璇㈡潯浠�")
public class QoRecharge extends QueryConditionVo {
- @Schema(description = "鍐滄埛濮撳悕")
- public String clientName;
+ private String clientName;
- @Schema(description = "鍐滄埛缂栧彿")
- private Long clientId;
+ private String clientNum;
- @Schema(description = "IC鍗″彿")
- public String cardAddr;
+ private Long cardNum;
- @Schema(description = "浠樻鏂瑰紡")
- public Integer paymentId;
+ //@Schema(description = "鍐滄埛缂栧彿")
+ //private Long clientId;
+
+ //@Schema(description = "IC鍗″彿")
+ //public String cardAddr;
+
+ //@Schema(description = "浠樻鏂瑰紡")
+ //public Integer paymentId;
//@Schema(description = "鍏呭�兼椂闂確寮�濮�")
//public LocalDateTime rechargeTimeStart;
@@ -38,9 +41,7 @@
//@Schema(description = "鍏呭�兼椂闂確缁撴潫")
//public LocalDateTime rechargeTimeStop;
- @Schema(description = "鍏呭�兼椂闂確寮�濮�")
- public String rechargeTimeStart;
+ //public String rechargeTimeStart;
- @Schema(description = "鍏呭�兼椂闂確缁撴潫")
- public String rechargeTimeStop;
+ //public String rechargeTimeStop;
}
--
Gitblit v1.8.0