From 9d5128803ebebb5788f13924a5775ac16494dfef Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期一, 18 八月 2025 10:05:05 +0800 Subject: [PATCH] 仓库,树,文档,借出修改 --- src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 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..3166ff1 100644 --- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java +++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java @@ -7,10 +7,12 @@ 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; /** * 鏂囨。鍊熼槄-褰掕繕琛� @@ -19,7 +21,9 @@ @TableName(value ="documentation_borrow_management") @Data @ApiModel(value = "鏂囨。鍊熼槄-褰掕繕琛�") -public class DocumentationBorrowManagement implements Serializable { +public class DocumentationBorrowManagement extends DateQueryDto implements Serializable { + + private static final long serialVersionUID = 1L; /** * 涓婚敭 */ @@ -29,13 +33,12 @@ /** * 鏂囨。id */ - @Excel(name = "鏂囨。id") + @ApiModelProperty(value = "鏂囨。id") private Long documentationId; /** * 鍊熼槄浜篿d */ - @Excel(name = "鍊熼槄浜篿d") @ApiModelProperty(value = "鍊熼槄浜篿d") private Long borrowerId; @@ -53,6 +56,7 @@ @ApiModelProperty(value = "鍊熼槄鏃ユ湡") @Excel(name = "鍊熼槄鏃ユ湡", dateFormat = "yyyy-MM-dd", width = 30) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDateTime borrowDate; /** @@ -95,7 +99,7 @@ * 鍒涘缓鐢ㄦ埛 */ @TableField(fill = FieldFill.INSERT) - private Long createUser; + private Integer createUser; /** * 淇敼鏃堕棿 @@ -107,13 +111,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