From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java
index e91df3e..c1a2fbf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageVehicleDetailVO.java
@@ -52,18 +52,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate storageTime;
- @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
- private Integer addressType;
-
- @ApiModelProperty(value = "使用部门/位置名称")
- private String useDeptName;
-
- @ApiModelProperty(value = "仓库名称")
- private String warehouseName;
-
- @ApiModelProperty(value = "所在位置")
- private String address;
-
@ApiModelProperty(value = "车辆资产明细列表（按保存展开后的一条资产记录对应一条明细）")
private List<VehicleAssetItemVO> assetItems;
@@ -142,5 +130,18 @@
@ApiModelProperty(value = "产权形式")
private String propertyRightForm;
+
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
+
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
+
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
+
}
}
--
Gitblit v1.7.1