From 47c5bd416bf37769022e41402add8a41c2d09c96 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 23 三月 2026 09:47:53 +0800
Subject: [PATCH] 1、生产工单搜索加上生产订单号搜索。 2、列表顺序除了按照优先级进行排序，还要根据工艺路线的工序的顺序进行排序，开始的排在前面
---
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