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/OfflinePayDto.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java
index fdaf862..9af180e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java
@@ -27,6 +27,7 @@
@ApiModelProperty(value = "账单列表")
@NotEmpty(message = "账单ID不能为空")
private List<String> billIds;
+
/**
* 凭证文件ID
*/
@@ -39,4 +40,6 @@
private Date payTime;
+
+
}
--
Gitblit v1.7.1