From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
index 1a55190..ef8fc01 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.ListToStringTypeHandler;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import org.springframework.format.annotation.DateTimeFormat;
@@ -22,13 +22,13 @@
* 璁″垝鏍囬
*/
@Excel(name = "璁″垝鏍囬")
- @ApiModelProperty("璁″垝鏍囬")
+ @Schema(description = "璁″垝鏍囬")
private String title;
/**
* 璁″垝鎻忚堪
*/
@Excel(name = "璁″垝鎻忚堪")
- @ApiModelProperty("璁″垝鎻忚堪")
+ @Schema(description = "璁″垝鎻忚堪")
private String description;
@@ -36,13 +36,13 @@
* 璁″垝绾у埆
*/
@Excel(name = "璁″垝绾у埆")
- @ApiModelProperty("璁″垝绾у埆")
+ @Schema(description = "璁″垝绾у埆")
private String level;
/**
* 鏃堕棿鍛ㄦ湡
*/
@Excel(name = "鏃堕棿鍛ㄦ湡")
- @ApiModelProperty("鏃堕棿鍛ㄦ湡")
+ @Schema(description = "鏃堕棿鍛ㄦ湡")
private String period;
/**
* 寮�濮嬫椂闂�
@@ -63,31 +63,31 @@
* 璐熻矗浜�
*/
@Excel(name = "璐熻矗浜�")
- @ApiModelProperty("璐熻矗浜�")
+ @Schema(description = "璐熻矗浜�")
private String assignee;
/**
* 鐘舵��
*/
@Excel(name = "鐘舵��")
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
/**
* 浼樺厛绾�
*/
@Excel(name = "浼樺厛绾�")
- @ApiModelProperty("浼樺厛绾�")
+ @Schema(description = "浼樺厛绾�")
private String priority;
/**
* 瀹屾垚搴�
*/
@Excel(name = "瀹屾垚搴�")
- @ApiModelProperty("瀹屾垚搴�")
+ @Schema(description = "瀹屾垚搴�")
private Integer progress;
/**
* 鏍囩
*/
@Excel(name = "鏍囩")
- @ApiModelProperty("鏍囩")
+ @Schema(description = "鏍囩")
@TableField(value = "tags",typeHandler = ListToStringTypeHandler.class,jdbcType = JdbcType.VARCHAR)
private List<String> tags;
/**
@@ -122,4 +122,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3