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/OfflinePayCheckDto.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java
new file mode 100644
index 0000000..51a9e92
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java
@@ -0,0 +1,48 @@
+package com.ruoyi.system.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class OfflinePayCheckDto implements Serializable {
+ /**
+ * 账单ID列表
+ */
+
+ @ApiModelProperty(value = "账单ID")
+ @NotEmpty(message = "账单ID不能为空")
+ private String billId;
+
+ @ApiModelProperty("实际支付金额")
+ @NotNull(message = "实际支付金额不能为空")
+ private BigDecimal amount;
+
+ @ApiModelProperty("确认单ID")
+ @NotNull(message = "确认单ID不能为空")
+ private String confirmId;
+
+ @ApiModelProperty("支付人")
+ private String payer;
+ @ApiModelProperty("支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime payTime;
+ @ApiModelProperty("支付凭证")
+ private String voucher;
+ @ApiModelProperty("银行流水ID")
+ private String flowId;
+
+ @ApiModelProperty("支付类型")
+ @NotEmpty(message = "支付类型不能为空")
+ private Integer payType;
+
+
+}
--
Gitblit v1.7.1