From 14de446d42a23f8823f56ef79214e0d0d634adaa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 16:57:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/pojo/StockInventory.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
index 9f36343..99e72a5 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
@@ -6,10 +6,13 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.lang.Nullable;
import javax.validation.constraints.NotBlank;
@@ -41,11 +44,15 @@
private BigDecimal qualitity;
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
@ApiModelProperty("鐗堟湰鍙�")
private Integer version;
@@ -55,7 +62,4 @@
@ApiModelProperty("棰勮鏁伴噺")
private Integer warnNum;
-
- @ApiModelProperty("绉熸埛id")
- private Integer tenantId;
}
--
Gitblit v1.9.3