From 836539b11e4871784db19058110b28b90c7c006e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 九月 2025 11:55:31 +0800
Subject: [PATCH] 审批代码提交
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 ed24be4..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
@@ -1,11 +1,6 @@
package com.ruoyi.system.vo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.system.model.OaApprovalTodo;
-import com.ruoyi.system.model.OaNotification;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,19 +37,22 @@
private LocalDateTime createTime;
-
+ @ApiModelProperty(value = "事项标题")
+ private String title;
@ApiModelProperty(value = "审批申请ID")
private Integer applicationId;
@ApiModelProperty(value = "报销金额/申请金额/合计金额/总金额（报销申请/款项申请/款项支付审批/广告制作）")
private BigDecimal amount;
@ApiModelProperty(value = "入库类型 0-正常入库(资产入库)")
- private Boolean storageType;
+ private Integer storageType;
@ApiModelProperty(value = "领用/借用/归还日期（物品借用/领用归还）")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDate operateTime;
@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