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/warehouse/pojo/DocumentationReturnManagement.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
index 304cd8c..2887cda 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,7 +18,7 @@
*/
@TableName(value ="documentation_return_management")
@Data
-@ApiModel(value = "鏂囨。褰掕繕琛�")
+@Schema(name = "鏂囨。褰掕繕琛�")
public class DocumentationReturnManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,7 +31,7 @@
/**
* 鏂囨。id
*/
- @ApiModelProperty(value = "鏂囨。id")
+ @Schema(description = "鏂囨。id")
private Long documentationId;
/**
* 鍊熼槄id
@@ -41,13 +40,13 @@
/**
* 鍊熼槄浜�
*/
- @ApiModelProperty(value = "鍊熼槄浜�")
+ @Schema(description = "鍊熼槄浜�")
@Excel(name = "鍊熼槄浜�")
private String borrower;
/**
* 褰掕繕浜�
*/
- @ApiModelProperty(value = "褰掕繕浜�")
+ @Schema(description = "褰掕繕浜�")
@Excel(name = "褰掕繕浜�")
private String returner;
@@ -55,14 +54,14 @@
* 鍊熼槄鐩殑
*/
@Excel(name = "鍊熼槄鐩殑")
- @ApiModelProperty(value = "鍊熼槄鐩殑")
+ @Schema(description = "鍊熼槄鐩殑")
private String borrowPurpose;
/**
* 鍊熼槄鏃ユ湡
*/
- @ApiModelProperty(value = "鍊熼槄鏃ユ湡")
+ @Schema(description = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -71,7 +70,7 @@
/**
* 搴斿綊杩樻棩鏈�
*/
- @ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
+ @Schema(description = "搴斿綊杩樻棩鏈�")
@Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate dueReturnDate;
@@ -79,7 +78,7 @@
/**
* 瀹為檯褰掕繕鏃ユ湡
*/
- @ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
+ @Schema(description = "瀹為檯褰掕繕鏃ユ湡")
@Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate returnDate;
@@ -87,14 +86,14 @@
/**
* 鍊熼槄鐘舵��
*/
- @ApiModelProperty(value = "鍊熼槄鐘舵��")
+ @Schema(description = "鍊熼槄鐘舵��")
@Excel(name = "鍊熼槄鐘舵��")
private String borrowStatus;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
--
Gitblit v1.9.3