From b3138924736b928ff8f5abc4c8c8490b75b03672 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 28 六月 2024 11:14:34 +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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..0a5e3a5 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
@@ -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,6 +39,7 @@
* 鍐滄埛缂栧彿锛屽紑鍗′娇鐢�
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
private String clientNum;
/**
@@ -44,7 +52,13 @@
* 姘村崱缂栧彿锛屼笉鏄紑鍗℃帴鍙ｄ紶鍏ワ紝鐢卞啘鎴风紪鍙疯幏寰楋紝鍏呭�奸渶瑕�
*/
@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