From b5f919e8cc4301b71ff6b12de93f7aefc823ca6d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 21 十月 2025 09:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index c54aebc..3855879 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -15,6 +16,7 @@
private Integer id;
@ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+
private String supplierName;
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
@@ -42,8 +44,8 @@
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime maintainTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate maintainTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -63,5 +65,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
--
Gitblit v1.9.3