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 | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 7cdbf17..3855879 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -1,11 +1,11 @@
package com.ruoyi.basic.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+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
@@ -16,6 +16,7 @@
private Integer id;
@ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+
private String supplierName;
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
@@ -43,20 +44,26 @@
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
- private LocalDateTime maintainTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate maintainTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
@ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
@ApiModelProperty(value = "绉熸埛ID")
- private Integer tenantId;
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
}
--
Gitblit v1.9.3