From 652db871507244a5838fc6b36d9b9771b527ad61 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java
index 913bc79..dd766dd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java
@@ -51,6 +51,8 @@
 
     @ApiModelProperty(value = "处置方式 0-报废,1-报损,2-捐赠(资产处置)")
     private Integer disposeType;
+    @ApiModelProperty(value = "报销类型 0-差旅招待交通费,1-企业日常采购,2-房租水电日常,3-聚餐团建,4-其他")
+    private Integer type;
     @ApiModelProperty(value = "更改方(资产变更)")
     private String ownershipDeptName;
     @ApiModelProperty(value = "领用物品(资产领用)")

--
Gitblit v1.7.1