From b33e6f53dd537abaebad066de12474580fcc33b2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 21 八月 2025 15:03:14 +0800
Subject: [PATCH] Merge branch 'pim_ywx'
---
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index e7878b0..a6c560f 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -3,14 +3,17 @@
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 lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 鏂囨。鍊熼槄-褰掕繕琛�
@@ -18,8 +21,10 @@
*/
@TableName(value ="documentation_borrow_management")
@Data
-@ApiModel(value = "鏂囨。鍊熼槄-褰掕繕琛�")
-public class DocumentationBorrowManagement implements Serializable {
+@ApiModel(value = "鏂囨。鍊熼槄琛�")
+public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
/**
* 涓婚敭
*/
@@ -29,15 +34,21 @@
/**
* 鏂囨。id
*/
- @Excel(name = "鏂囨。id")
+ @ApiModelProperty(value = "鏂囨。id")
private Long documentationId;
/**
- * 鍊熼槄浜篿d
+ * 鍊熼槄浜�
*/
- @Excel(name = "鍊熼槄浜篿d")
- @ApiModelProperty(value = "鍊熼槄浜篿d")
- private Long borrowerId;
+ @ApiModelProperty(value = "鍊熼槄浜�")
+ @Excel(name = "鍊熼槄浜�")
+ private String borrower;
+ /**
+ * 褰掕繕浜�
+ */
+ @ApiModelProperty(value = "褰掕繕浜�")
+ @Excel(name = "褰掕繕浜�")
+ private String returner;
/**
* 鍊熼槄鐩殑
@@ -52,24 +63,25 @@
@ApiModelProperty(value = "鍊熼槄鏃ユ湡")
@Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime borrowDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate borrowDate;
/**
* 搴斿綊杩樻棩鏈�
*/
@ApiModelProperty(value = "搴斿綊杩樻棩鏈�")
@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 = "瀹為檯褰掕繕鏃ユ湡")
@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;
/**
* 鍊熼槄鐘舵��
@@ -95,7 +107,7 @@
* 鍒涘缓鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 淇敼鏃堕棿
@@ -107,13 +119,11 @@
* 淇敼鐢ㄦ埛
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateUser;
+ private Integer updateUser;
/**
* 绉熸埛id
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
- private static final long serialVersionUID = 1L;
}
\ No newline at end of file
--
Gitblit v1.9.3