From fda182841a8258e355365c8ff16f28672b8523e6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:55:34 +0800
Subject: [PATCH] 联调问题修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
index 7c6da6b..8658098 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
@@ -98,6 +98,9 @@
     @TableField("user_name")
     private String userName;
 
+    @ApiModelProperty(value = "位置类型 0-部门,1-仓库,2-录入地址")
+    private Integer addressType;
+
     @ApiModelProperty(value = "使用部门/位置ID")
     @TableField("use_dept_id")
     private Integer useDeptId;
@@ -178,5 +181,8 @@
     @TableField("disabled")
     private Boolean disabled;
 
+    @ApiModelProperty(value = "使用部门/位置")
+    @TableField(exist = false)
+    private String useDeptOrLocation;
 
 }

--
Gitblit v1.7.1