From 708dce320caedf9973ff0282098fb70dafd6702e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 14:09:57 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
index 4f8f7ad..d17a0fa 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/DtoActiveCard.java
@@ -10,7 +10,7 @@
  * @author ZhuBaoMin
  * @date 2024-01-18 19:44
  * @LastEditTime 2024-01-18 19:44
- * @Description
+ * @Description 寮�鍗″強琛ュ崱浼犲叆瀵硅薄
  */
 
 @Data
@@ -18,9 +18,16 @@
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
-@Schema(name = "寮�鍗�/琛ュ崱浼犲叆瀵硅薄")
+@Schema(name = "寮�鍗″強琛ュ崱浼犲叆瀵硅薄")
 public class DtoActiveCard {
     public static final long serialVersionUID = 202401181945001L;
+
+    /**
+     * 鍗忚鍚嶇О
+     */
+    @NotBlank(message = "鎮ㄥ繀椤婚�夋嫨涓�涓崗璁�")
+    private String protocol;
+
     /**
      * 姘村崱鍦板潃锛屼粎淇濆瓨锛屾棤涓氬姟
      */
@@ -32,10 +39,11 @@
      * 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
      */
     @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
     private String clientNum;
 
     /**
-     * 鍐滄埛ID锛堜富閿級锛屼笉鏄紑鍗℃帴鍙d紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝淇濆瓨寮�鍗¤褰曞拰鍏呭�艰褰曢兘闇�瑕�
+     * 鍐滄埛ID锛堜富閿級
      */
     @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Long clientId;
@@ -44,7 +52,13 @@
      * 姘村崱缂栧彿锛屼笉鏄紑鍗℃帴鍙d紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝鍏呭�奸渶瑕�
      */
     @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    private String cardNum;
+    private Long cardNum;
+
+    /**
+     * 鍘熸寕澶卞崱ID
+     */
+    @Schema(description = "鍘熸寕澶卞崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Long originalCardId;
 
     /**
      * 鍗$墖璐圭敤

--
Gitblit v1.8.0