From 5667d14c708f9244fe2419707f98ff472ca23480 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:30:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java
index 6512fee..d1e7b99 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlAuditVO.java
@@ -1,5 +1,6 @@
 package com.ruoyi.management.domain.vo;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,6 +16,9 @@
 
     @ApiModelProperty("发起人电话")
     private String sysPhone;
+
+    @ApiModelProperty("发起时间")
+    private DateTime createTime;
 
     @ApiModelProperty("入库管理id")
     private Long rkId;
@@ -33,6 +37,8 @@
 
     @ApiModelProperty("1 待管理员审核,2 待主管审核,3 待主任审核, 4已完成, 5,已拒绝")
     private Integer auditStatus;
+    @ApiModelProperty("1 待管理员审核,2 待主管审核,3 待主任审核, 4已完成, 5,已拒绝")
+    private Integer state;
 
 
     @ApiModelProperty("申请人id")

--
Gitblit v1.7.1