From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index b819cd5..3855879 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -1,9 +1,11 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -14,6 +16,7 @@
private Integer id;
@ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+
private String supplierName;
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
@@ -41,7 +44,8 @@
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
- private LocalDateTime maintainTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate maintainTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -61,5 +65,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
--
Gitblit v1.9.3