From 6d18969a899c0eb7836ff2a91ba12cbd151b87c8 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 30 十月 2024 09:47:24 +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/SeRefund.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java
index 75f3c85..1cd2ad3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRefund.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
@@ -45,7 +46,6 @@
* 閽卞寘ID
*/
@Schema(description = "閽卞寘ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "閽卞寘ID涓嶈兘涓虹┖")
private Long walletId;
/**
@@ -60,6 +60,7 @@
*/
@Schema(description = "閽卞寘浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Min(value = 0, message = "閽卞寘浣欓涓嶈兘灏忎簬0")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double money;
/**
@@ -67,7 +68,8 @@
*/
@Schema(description = "閫�娆鹃噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Min(value = 0, message = "娑堥��娆鹃噾棰濅笉鑳藉皬浜�0")
- @NotNull(message = "閫�娆鹃噾棰濅笉鑳戒负绌�")
+ //@NotNull(message = "閫�娆鹃噾棰濅笉鑳戒负绌�")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double refundAmount;
/**
@@ -75,6 +77,7 @@
*/
@Schema(description = "閫�娆惧悗浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Min(value = 0, message = "閫�娆惧悗浣欓涓嶈兘灏忎簬0")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double afterRefund;
/**
@@ -108,6 +111,6 @@
* 瀹℃牳澶囨敞
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 0, max = 200)
private String remarks;
}
\ No newline at end of file
--
Gitblit v1.8.0