From b069101e1bf347ceab11e33d73b2fbb7f37d4686 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:15:53 +0800
Subject: [PATCH] feat(production): 生产订单的工艺路线和参数的增删改逻辑
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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..7d688b4 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@@ -15,7 +14,7 @@
*/
@Data
@TableName("notice")
-@ApiModel
+@Schema
public class Notice {
private static final long serialVersionUID = 1L;
@@ -26,38 +25,38 @@
/**
* 鍏憡鏍囬
*/
- @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;
-
- private String statusName;
/**
* 鍏憡鍐呭
*/
- @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;
@@ -83,7 +82,10 @@
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3