From 6365012e69b76d2a7804f5a462745f09a5fa0105 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期六, 11 十月 2025 18:23:02 +0800 Subject: [PATCH] 资产盘点接口 --- ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java | 10 +++++++++- 1 files changed, 9 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 7c6da6b..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; @@ -76,7 +77,7 @@ @ApiModelProperty(value = "数量") @TableField("quantity") - private BigDecimal quantity; + private Integer quantity; @ApiModelProperty(value = "单价") @TableField("unit_price") @@ -97,6 +98,9 @@ @ApiModelProperty(value = "使用人") @TableField("user_name") private String userName; + + @ApiModelProperty(value = "位置类型 0-部门,1-仓库,2-录入地址") + private Integer addressType; @ApiModelProperty(value = "使用部门/位置ID") @TableField("use_dept_id") @@ -176,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