From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 09 十月 2025 11:56:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationChange.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationChange.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationChange.java index 5d35924..6c79c4f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationChange.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationChange.java @@ -52,12 +52,16 @@ @TableField("ownership_dept_id") private Integer ownershipDeptId; - @ApiModelProperty(value = "仓库ID,关联warehouse表") - @TableField("warehouse_id") + @ApiModelProperty(value = "使用/位置类型 0-部门,1-仓库,2-录入地址") + private Integer addressType; + + @ApiModelProperty(value = "使用部门ID") + private Integer useDeptId; + + @ApiModelProperty(value = "仓库ID") private Integer warehouseId; - @ApiModelProperty(value = "存放地点") - @TableField("address") + @ApiModelProperty(value = "所在位置") private String address; @ApiModelProperty(value = "使用人") -- Gitblit v1.7.1