From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id,维修价格字段,重整状态对应值。优化添加设备报修接口,同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。

---
 src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index ef046ac..cc9f926 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -1,11 +1,13 @@
 package com.ruoyi.collaborativeApproval.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 鍏憡琛�
@@ -52,6 +54,13 @@
     private Integer priority;
 
     /**
+     * 杩囨湡鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expirationDate;
+
+
+    /**
      * 鍒涘缓鑰�
      */
     @TableField(fill = FieldFill.INSERT)
@@ -61,6 +70,7 @@
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**

--
Gitblit v1.9.3