From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-require/src/main/java/com/ruoyi/require/vo/AcceptanceVo.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/vo/AcceptanceVo.java b/cnas-require/src/main/java/com/ruoyi/require/vo/AcceptanceVo.java
index 38133df..2a325fa 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/vo/AcceptanceVo.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/vo/AcceptanceVo.java
@@ -1,5 +1,6 @@
package com.ruoyi.require.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -20,7 +21,7 @@
@Schema(description = "鐢熶骇鍘傚")
private String factoryManufacturer;
- @Schema(description = "鍑哄満缂栧彿")
+ @Schema(description = "鍑哄巶缂栧彿")
private String factoryNum;
@Schema(description = "绠＄悊缂栧彿")
@@ -32,15 +33,24 @@
@Schema(description = "鏁伴噺")
private Long quantity;
+ @Schema(description = "鍗曚綅")
+ private String unit;
+
@Schema(description = "璐疆鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime acquisitionDate;
@Schema(description = "鏈夋晥鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime effectiveDate;
- @Schema(description = "鏂囨。缂栧彿")
+ @Schema(description = "妗ｆ缂栧彿")
private String fileNum;
@Schema(description = "瀛樻斁浣嶇疆")
private String position;
+
+ @Schema(description = "鎻愪氦鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
}
--
Gitblit v1.9.3