From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java
index 8aef70f..185a485 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java
@@ -29,17 +29,10 @@
private String deptName;
@ApiModelProperty(value = "申请人ID")
- @NotNull(message = "申请人不能为空")
private Integer applicantUserId;
@ApiModelProperty(value = "申请人姓名")
- @NotBlank(message = "申请人姓名不能为空")
private String applicantName;
-
- @ApiModelProperty(value = "申请日期")
- @NotNull(message = "申请日期不能为空")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate applicationDate;
@ApiModelProperty(value = "入库备注")
@Size(max = 500, message = "入库备注不能超过500字符")
@@ -58,10 +51,19 @@
@ApiModelProperty(value = "入库类型 0-正常入库")
@NotNull(message = "入库类型不能为空")
- private Boolean storageType;
+ private Integer storageType;
@ApiModelProperty(value = "入库日期")
@NotNull(message = "入库日期不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate storageTime;
-}
\ No newline at end of file
+
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
+
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
+}
--
Gitblit v1.7.1