From 685c8f92c76760da1ff3a5d88f34201c7e0006bd Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 05 十二月 2025 16:07:05 +0800
Subject: [PATCH] yys  修改巡检模块,通知管理

---
 src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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..35eb6c0 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;
 
 /**
  * 鍏憡琛�
@@ -31,7 +33,7 @@
      * 鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�
      */
     @ApiModelProperty("鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�")
-        private Integer type;
+    private String type;
 
     /**
      * 鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級
@@ -51,6 +53,14 @@
     @ApiModelProperty("浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)")
     private Integer priority;
 
+
+    /**
+     * 杩囨湡鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expirationDate;
+
+
     /**
      * 鍒涘缓鑰�
      */
@@ -61,6 +71,7 @@
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**

--
Gitblit v1.9.3