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/OaApprovalApplications.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java index 9b46af2..ca30f30 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.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; @@ -31,7 +32,7 @@ @ApiModelProperty(value = "主键") @TableId(value = "id", type = IdType.AUTO) - private Long id; + private Integer id; @ApiModelProperty(value = "申请单号") @TableField("application_code") @@ -49,13 +50,13 @@ @TableField("applicant_name") private String applicantName; - @ApiModelProperty(value = "部门ID") - @TableField("dept_id") - private Integer deptId; - @ApiModelProperty(value = "所属部门") @TableField("dept_name") private String deptName; + + @ApiModelProperty(value = "部门ID") + @TableField("dept_id") + private Integer deptId; @ApiModelProperty(value = "申请日期") @TableField("application_date") @@ -95,6 +96,7 @@ @ApiModelProperty(value = "是否删除 0-否,1-是") @TableField("disabled") + @TableLogic private Integer disabled; -- Gitblit v1.7.1