From a1454f4b28db363ca4c4a6ea182d3aab95dc9518 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 四月 2026 11:17:50 +0800
Subject: [PATCH] fix(sales): 修正新增销售订单下发生产计划
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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..7d688b4 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -1,11 +1,12 @@
package com.ruoyi.collaborativeApproval.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 鍏憡琛�
@@ -13,7 +14,7 @@
*/
@Data
@TableName("notice")
-@ApiModel
+@Schema
public class Notice {
private static final long serialVersionUID = 1L;
@@ -24,32 +25,40 @@
/**
* 鍏憡鏍囬
*/
- @ApiModelProperty("鍏憡鏍囬")
+ @Schema(description = "鍏憡鏍囬")
private String title;
/**
- * 鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�
+ * 鍏憡绫诲瀷
*/
- @ApiModelProperty("鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�")
- private Integer type;
+ @Schema(description = "鍏憡绫诲瀷")
+ private String type;
/**
* 鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級
*/
- @ApiModelProperty("鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
+ @Schema(description = "鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
private Integer status;
/**
* 鍏憡鍐呭
*/
- @ApiModelProperty("鍏憡鍐呭")
+ @Schema(description = "鍏憡鍐呭")
private String content;
/**
* 浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)
*/
- @ApiModelProperty("浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)")
+ @Schema(description = "浼樺厛绾�(1鏅�� 2閲嶈 3绱ф��)")
private Integer priority;
+
+
+ /**
+ * 杩囨湡鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date expirationDate;
+
/**
* 鍒涘缓鑰�
@@ -61,6 +70,7 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
@@ -72,7 +82,10 @@
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3