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/model/AssetMain.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 b3c32ee..0c1665f 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -98,6 +99,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;
@@ -158,7 +162,6 @@
@TableField("is_in_use")
private Integer inUse;
-
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private LocalDateTime createTime;
@@ -177,7 +180,11 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Boolean disabled;
+ @ApiModelProperty(value = "使用部门/位置")
+ @TableField(exist = false)
+ private String useDeptOrLocation;
}
--
Gitblit v1.7.1