From 2caea3a39884a60977ca1dc495306e3eda931d47 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 07 十二月 2023 20:51:08 +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/SeActiveCardHistory.java |  157 +++++++++++++++++++++-------------------------------
 1 files changed, 64 insertions(+), 93 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java
index f7ebbb9..78e578a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCardHistory.java
@@ -1,5 +1,18 @@
 package com.dy.pipIrrGlobal.pojoSe;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+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 lombok.*;
+import org.hibernate.validator.constraints.Length;
+
 import java.util.Date;
 
 /**
@@ -8,124 +21,82 @@
  * @LastEditTime 2023/12/7 9:06
  * @Description
  */
+
 /**
-    * 寮�鍗�/琛ュ崱鍘嗗彶琛�
-    */
-public class SeActiveCardHistory {
+ * 寮�鍗�/琛ュ崱鍘嗗彶琛�
+ */
+
+@TableName(value="se_active_card_history", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "寮�鍗�/琛ュ崱鍘嗗彶瀹炰綋")
+public class SeActiveCardHistory implements BaseEntity {
+    public static final long serialVersionUID = 1L;
+
     /**
-    * 涓婚敭
-    */
+     * 涓婚敭
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableId(type = IdType.INPUT)
+    @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Long id;
 
     /**
-    * 姘村崱缂栧彿
-    */
+     * 姘村崱缂栧彿
+     */
+    @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "姘村崱缂栧彿涓嶅皬浜巤min}", min = 1)
     private Long cardid;
 
     /**
-    * 鍗$墖璐圭敤
-    */
+     * 鍗$墖璐圭敤
+     */
+    @Schema(description = "鍗$墖璐圭敤", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Length(message = "鍗$墖璐圭敤涓嶅皬浜巤min}瀛�", min = 1)
     private Integer cardcost;
 
     /**
-    * 浠樻鏂瑰紡缂栧彿
-    */
+     * 浠樻鏂瑰紡缂栧彿
+     */
+    @Schema(description = "浠樻鏂瑰紡缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "浠樻鏂瑰紡缂栧彿涓嶅ぇ浜巤max}锛屼笉灏忎簬{min}", min = 1, max = 4)
     private Long paymentid;
 
     /**
-    * 琛ュ崱閲戦
-    */
+     * 琛ュ崱閲戦
+     */
+    @Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Length(message = "琛ュ崱閲戦涓嶅皬浜巤min}", min = 0)
     private Double reissueamount;
 
     /**
-    * 鎿嶄綔绫诲瀷;1-寮�鍗★紝2-琛ュ崱
-    */
+     * 鎿嶄綔绫诲瀷;1-寮�鍗★紝2-琛ュ崱
+     */
+    @Schema(description = "鎿嶄綔绫诲瀷", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Max(message = "鎿嶄綔绫诲瀷鍙兘1鎴�2", value = 2)
+    @Min(message = "鎿嶄綔绫诲瀷鍙兘1鎴�2",value = 1)
     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鐨勬暣鏁�")
     private Long operator;
 
     /**
-    * 鎿嶄綔鏃堕棿
-    */
+     * 鎿嶄綔鏃堕棿
+     */
+    @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Date operatedt;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCardid() {
-        return cardid;
-    }
-
-    public void setCardid(Long cardid) {
-        this.cardid = cardid;
-    }
-
-    public Integer getCardcost() {
-        return cardcost;
-    }
-
-    public void setCardcost(Integer cardcost) {
-        this.cardcost = cardcost;
-    }
-
-    public Long getPaymentid() {
-        return paymentid;
-    }
-
-    public void setPaymentid(Long paymentid) {
-        this.paymentid = paymentid;
-    }
-
-    public Double getReissueamount() {
-        return reissueamount;
-    }
-
-    public void setReissueamount(Double reissueamount) {
-        this.reissueamount = reissueamount;
-    }
-
-    public Byte getOperatetype() {
-        return operatetype;
-    }
-
-    public void setOperatetype(Byte operatetype) {
-        this.operatetype = operatetype;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public Long getOperator() {
-        return operator;
-    }
-
-    public void setOperator(Long operator) {
-        this.operator = operator;
-    }
-
-    public Date getOperatedt() {
-        return operatedt;
-    }
-
-    public void setOperatedt(Date operatedt) {
-        this.operatedt = operatedt;
-    }
 }
\ No newline at end of file

--
Gitblit v1.8.0