From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/CachPayDto.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/CachPayDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/CachPayDto.java
index fbc237e..d7670e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/CachPayDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/CachPayDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -14,12 +16,15 @@
public class CachPayDto implements Serializable {
@ApiModelProperty(value = "支付类型：1.银行、2.现金")
+ @NotNull(message = "支付类型不能为空")
private Integer payType;
@ApiModelProperty(value = "账单ID")
+ @NotEmpty(message = "账单ID不能为空")
private String billId;
- @ApiModelProperty(value = "金额")
+ @ApiModelProperty(value = "实付金额")
+ @NotNull(message = "实付金额不能为空")
private BigDecimal amount;
@ApiModelProperty(value = "付款人姓名")
@@ -28,6 +33,6 @@
@ApiModelProperty(value = "银行支付的付款凭证")
private String voucher;
- @ApiModelProperty("银行支付的银行流水")
- private TBankFlow tBankFlow;
+ @ApiModelProperty(value = "银行流水ID")
+ private String flowId;
}
--
Gitblit v1.7.1