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 |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index 33c3f72..cc9f926 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -41,8 +41,6 @@
     @ApiModelProperty("鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
     private Integer status;
 
-    private String statusName;
-
     /**
      * 鍏憡鍐呭
      */
@@ -58,6 +56,7 @@
     /**
      * 杩囨湡鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expirationDate;
 
 

--
Gitblit v1.9.3