From 0388d54af57e8d3d4a99554501b232ca572b50c6 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 17:48:51 +0800
Subject: [PATCH] 客户满意度新增附件与委托单关联；供应商管理新增附件；标准物质接收、记录、验收模块调整；委托单新增已完成列表接口（满意度下拉用）；管理记录服务调整
---
cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java b/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java
index d98cad5..7907cc7 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/vo/SubstanceRecordVo.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;
@@ -17,29 +18,27 @@
@Schema(description = "瑙勬牸鍨嬪彿")
private String model;
- @Schema(description = "鍑哄満缂栧彿")
+ @Schema(description = "鍑哄巶缂栧彿")
private String factoryNum;
@Schema(description = "鏁伴噺")
private Long quantity;
+ @Schema(description = "鍗曚綅")
+ private String unit;
+
+ @Schema(description = "鏈棰嗙敤鏁伴噺")
+ private Long borrowQuantity;
+
+ @Schema(description = "棰嗙敤鍚庡墿浣欐暟閲�")
+ private Long remainingQuantity;
+
@Schema(description = "棰嗙敤浜�")
private String borrowUser;
@Schema(description = "鍊熷嚭鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime borrowDate;
-
- @Schema(description = "褰掕繕鏃ユ湡")
- private LocalDateTime returnDate;
-
- @Schema(description = "褰掕繕浜�")
- private String returnedPerson;
-
- @Schema(description = "瀹屽ソ鎬�")
- private String returnIntegrity;
-
- @Schema(description = "0锛氬�熺敤 1:褰掕繕")
- private String status;
@Schema(description = "澶囨敞")
private String remark;
--
Gitblit v1.9.3