From bdd967acce69d2420d9866789dfcee42c7e77023 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationDispose.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationDispose.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationDispose.java
index 840e03c..f599f07 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationDispose.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationDispose.java
@@ -24,7 +24,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("oa_approval_application_dispose")
-@ApiModel(value="OaApprovalApplicationDispose对象", description="资产领用单明细表")
+@ApiModel(value="OaApprovalApplicationDispose对象", description="资产处置单明细表")
public class OaApprovalApplicationDispose implements Serializable {
private static final long serialVersionUID = 1L;
@@ -51,7 +51,7 @@
@ApiModelProperty(value = "处置方式 0-报废，1-报损，2-捐赠")
@TableField("dispose_type")
- private Boolean disposeType;
+ private Integer disposeType;
@ApiModelProperty(value = "处置总金额（元）")
@TableField("dispose_total_amount")
--
Gitblit v1.7.1