From 7bf80c057f8e17fd37f1936e5b8dc1e1efad4bea Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 11 七月 2024 20:32:14 +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 | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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..92c9f2b 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.*;
@@ -34,7 +33,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱鍏呭�煎巻鍙插疄浣�")
public class SeRechargeHistory implements BaseEntity {
- public static final long serialVersionUID = 202312080812001L;
+ public static final long serialVersionUID = 202401151519002L;
/**
* 涓婚敭
@@ -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;
/**
* 鍗＄墖浣欓
@@ -110,10 +113,10 @@
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
+ * 鎿嶄綔浜篒D
*/
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
--
Gitblit v1.8.0