From 27d8f8fbb2e02be63338b80f808969faa35adac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 11:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java
index e0d5a2a..ec0146a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java
@@ -66,11 +66,11 @@
@ApiModelProperty(value = "使用人")
private String userName;
- @ApiModelProperty(value = "使用部门/位置ID")
- private Integer useDeptId;
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
- @ApiModelProperty(value = "仓库ID")
- private Integer warehouseId;
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
--
Gitblit v1.7.1