From 8537a164dbd4c8696c3269141a8f18922d4ed15f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 十月 2025 09:02:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageDTO.java | 14 +-------------
1 files changed, 1 insertions(+), 13 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 56155a6..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,17 +51,12 @@
@ApiModelProperty(value = "入库类型 0-正常入库")
@NotNull(message = "入库类型不能为空")
- private Boolean storageType;
+ private Integer storageType;
@ApiModelProperty(value = "入库日期")
@NotNull(message = "入库日期不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate storageTime;
-
- // 新增：统一的资产所在单位信息（用于整单校验）
- @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
- @NotNull(message = "位置类型不能为空")
- private Integer addressType;
@ApiModelProperty(value = "使用部门/位置名称")
private String useDeptName;
--
Gitblit v1.7.1