From 7bce3a96c4a1a61a2c299be033c3fb798648ad78 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 十月 2024 15:05:49 +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/SeActiveCard.java | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
index 3a43352..750461f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java
@@ -5,10 +5,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.*;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -16,8 +15,8 @@
/**
* @author ZhuBaoMin
- * @date 2023/12/5 17:39
- * @LastEditTime 2023/12/5 17:39
+ * @date 2023/12/8 16:53
+ * @LastEditTime 2023/12/8 16:53
* @Description
*/
@@ -32,8 +31,8 @@
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "寮�鍗�/琛ュ崱瀹炰綋")
-public class SeActiveCard {
- public static final long serialVersionUID = 20231191728001L;
+public class SeActiveCard implements BaseEntity {
+ public static final long serialVersionUID = 202401151518001L;
/**
* 涓婚敭
@@ -46,9 +45,30 @@
/**
* 姘村崱缂栧彿
*/
- @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "姘村崱缂栧彿涓嶅皬浜巤min}", min = 1)
+ //@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
+ //private String cardnum;
+
+ /**
+ * 鍐滄埛缂栧彿
+ */
+ //@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
+ //private String clientnum;
+
+ /**
+ * 姘村崱ID;姘村崱涓婚敭
+ */
+ @Schema(description = "姘村崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "姘村崱ID涓嶈兘涓虹┖")
private Long cardid;
+
+ /**
+ * 鍐滄埛ID;鍐滄埛涓婚敭
+ */
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖")
+ private Long clientid;
/**
* 鍗＄墖璐圭敤
@@ -69,7 +89,7 @@
*/
@Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "琛ュ崱閲戦涓嶅皬浜巤min}", min = 0)
- private Double reissueamount;
+ private Float reissueamount;
/**
* 鎿嶄綔绫诲瀷;1-寮�鍗★紝2-琛ュ崱
@@ -80,22 +100,22 @@
private Byte operatetype;
/**
- * 澶囨敞淇℃伅
- */
+ * 澶囨敞淇℃伅
+ */
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
- */
- @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�")
+ * 鎿嶄綔浜篒D
+ */
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
- * 鎿嶄綔鏃堕棿
- */
+ * 鎿嶄綔鏃堕棿
+ */
@Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date operatedt;
}
\ No newline at end of file
--
Gitblit v1.8.0