From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationReimbursement.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationReimbursement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationReimbursement.java
index 70996a5..538e289 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationReimbursement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationReimbursement.java
@@ -10,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
* <p>
@@ -37,7 +38,9 @@
@ApiModelProperty(value = "报销类型 0-差旅招待交通费，1-企业日常采购，2-房租水电日常，3-聚餐团建，4-其他")
@TableField("type")
- private Boolean type;
+ private Integer type;
-
+ @ApiModelProperty(value = "总金额")
+ @TableField("reimbursement_amount")
+ private BigDecimal reimbursementAmount;
}
--
Gitblit v1.7.1