From 857d738b56e4801a07521cfde502bd5c0f2bf132 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
index 2d222f9..a364faa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRechargeHistory.java
@@ -7,7 +7,6 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dy.common.po.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import lombok.*;
@@ -45,18 +44,22 @@
     private Long id;
 
     /**
-     * 姘村崱缂栧彿
+     * 姘村崱ID
      */
-    @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
-    private String cardnum;
+    @Schema(description = "姘村崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    //@NotBlank(message = "姘村崱ID涓嶈兘涓虹┖")
+    //private String cardnum;
+    @NotNull(message = "姘村崱ID涓嶈兘涓虹┖")
+    private Long cardid;
 
     /**
-     * 鍐滄埛缂栧彿
+     * 鍐滄埛ID
      */
-    @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
-    private String clientnum;
+    @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    //@NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖")
+    //private String clientnum;
+    @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖")
+    private Long clientid;
 
     /**
      * 鍗$墖浣欓

--
Gitblit v1.8.0