From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index 3166ff1..8887198 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -3,14 +3,14 @@
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
 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;
 
@@ -20,7 +20,7 @@
  */
 @TableName(value ="documentation_borrow_management")
 @Data
-@ApiModel(value = "鏂囨。鍊熼槄-褰掕繕琛�")
+@Schema(name = "鏂囨。鍊熼槄琛�")
 public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,59 +33,66 @@
     /**
      * 鏂囨。id
      */
-    @ApiModelProperty(value = "鏂囨。id")
+    @Schema(description = "鏂囨。id")
     private Long documentationId;
 
     /**
-     * 鍊熼槄浜篿d
+     * 鍊熼槄浜�
      */
-    @ApiModelProperty(value = "鍊熼槄浜篿d")
-    private Long borrowerId;
+    @Schema(description = "鍊熼槄浜�")
+    @Excel(name = "鍊熼槄浜�")
+    private String borrower;
+    /**
+     * 褰掕繕浜�
+     */
+    @Schema(description = "褰掕繕浜�")
+    @Excel(name = "褰掕繕浜�")
+    private String returner;
 
     /**
      * 鍊熼槄鐩殑
      */
     @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 HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime borrowDate;
+    private LocalDate borrowDate;
 
     /**
      * 搴斿綊杩樻棩鏈�
      */
-    @ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
+    @Schema(description = "搴斿綊杩樻棩鏈�")
     @Excel(name = "搴斿綊杩樻棩鏈�", dateFormat = "yyyy-MM-dd", width = 30)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime dueReturnDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate dueReturnDate;
 
     /**
      * 瀹為檯褰掕繕鏃ユ湡
      */
-    @ApiModelProperty(value = "瀹為檯褰掕繕鏃ユ湡")
+    @Schema(description = "瀹為檯褰掕繕鏃ユ湡")
     @Excel(name = "瀹為檯褰掕繕鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime returnDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate returnDate;
 
     /**
      * 鍊熼槄鐘舵��
      */
-    @ApiModelProperty(value = "鍊熼槄鐘舵��")
+    @Schema(description = "鍊熼槄鐘舵��")
     @Excel(name = "鍊熼槄鐘舵��")
     private String borrowStatus;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value = "澶囨敞")
+    @Schema(description = "澶囨敞")
     @Excel(name = "澶囨敞")
     private String remark;
 
@@ -118,4 +125,7 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }
\ No newline at end of file

--
Gitblit v1.9.3