From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 11:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java | 9 +++++++++
1 files changed, 9 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 d4f5661..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
@@ -1,11 +1,13 @@
package com.ruoyi.system.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
@Data
@@ -25,6 +27,7 @@
@ApiModelProperty(value = "账单列表")
@NotEmpty(message = "账单ID不能为空")
private List<String> billIds;
+
/**
* 凭证文件ID
*/
@@ -32,5 +35,11 @@
@NotEmpty(message = "凭证文件不能为空")
private String voucher;
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
+
+
}
--
Gitblit v1.7.1