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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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
index 97d1159..51a9e92 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java
@@ -17,9 +17,6 @@
/**
* 账单ID列表
*/
- @ApiModelProperty("账单ID列表，管理员处理后的")
- @NotEmpty(message = "账单列表不能为空")
- private List<String> billIds;
@ApiModelProperty(value = "账单ID")
@NotEmpty(message = "账单ID不能为空")
@@ -40,8 +37,12 @@
private LocalDateTime payTime;
@ApiModelProperty("支付凭证")
private String voucher;
+ @ApiModelProperty("银行流水ID")
+ private String flowId;
- @ApiModelProperty("银行流水")
- private TBankFlow tBankFlow;
+ @ApiModelProperty("支付类型")
+ @NotEmpty(message = "支付类型不能为空")
+ private Integer payType;
+
}
--
Gitblit v1.7.1