From 2a959177f1adcd36f790e14718bbd116752e5c64 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 17:19:10 +0800
Subject: [PATCH] 2024-10-12 朱宝民 优化交易明细导出、取水口导出、阀控器导出

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
index bdf4fb4..e6cbdae 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/DtoActiveCard.java
@@ -21,18 +21,30 @@
     public static final long serialVersionUID = 20231191728001L;
 
     /**
-     * 姘村崱鍦板潃
+     * 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟
      */
     @Schema(description = "姘村崱鍦板潃", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @NotBlank
+    @NotBlank(message = "姘村崱鍦板潃涓嶈兘涓虹┖")
     private String cardAddr;
 
     /**
-     * 鍐滄埛ID
+     * 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
+     */
+    @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private String clientNum;
+
+    /**
+     * 鍐滄埛ID锛堜富閿級锛屼笉鏄紑鍗℃帴鍙d紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝淇濆瓨寮�鍗¤褰曞拰鍏呭�艰褰曢兘闇�瑕�
      */
     @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @Positive(message = "鍐滄埛ID蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
     private Long clientId;
+
+    /**
+     * 姘村崱缂栧彿
+     * 琛ュ崱鏃朵娇鐢�
+     */
+    @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Long cardNum;
 
     /**
      * 鍗$墖璐圭敤
@@ -53,7 +65,7 @@
      */
     @Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @Min(value = 0, message="琛ュ崱閲戦涓嶈兘灏忎簬0")
-    private Double reissueAmount;
+    private Float reissueAmount;
 
     /**
      * 鏀粯鏂瑰紡缂栧彿

--
Gitblit v1.8.0