From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位,审核

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

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index 4d382f4..5ca6e4b 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -30,10 +30,10 @@
     private String title;
 
     /**
-     * 鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�
+     * 鍏憡绫诲瀷
      */
-    @ApiModelProperty("鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�")
-        private Integer type;
+    @ApiModelProperty("鍏憡绫诲瀷")
+    private String type;
 
     /**
      * 鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級
@@ -53,9 +53,11 @@
     @ApiModelProperty("浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)")
     private Integer priority;
 
+
     /**
      * 杩囨湡鏃堕棿
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expirationDate;
 
 

--
Gitblit v1.9.3