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 | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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
new file mode 100644
index 0000000..d7670e1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/CachPayDto.java
@@ -0,0 +1,38 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.model.TBankFlow;
+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;
+
+/**
+ * 收款对象
+ */
+@Data
+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 = "实付金额")
+ @NotNull(message = "实付金额不能为空")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "付款人姓名")
+ private String payer;
+
+ @ApiModelProperty(value = "银行支付的付款凭证")
+ private String voucher;
+
+ @ApiModelProperty(value = "银行流水ID")
+ private String flowId;
+}
--
Gitblit v1.7.1