From 520a715610bd67a6401e989ada8b1c43a312163b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 11 九月 2026 08:09:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 2c1fecb..097c5f9 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -3,18 +3,22 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.enums.ReviewStatusEnum;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serial;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@TableName("stock_in_record")
@Schema(name = "鍏ュ簱绠＄悊")
-public class StockInRecord {
+public class StockInRecord implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
* 搴忓彿
@@ -23,9 +27,11 @@
private Long id;
@Schema(description = "鍏ュ簱鎵规")
+ @Excel(name = "鍏ュ簱鎵规")
private String inboundBatches;
@Schema(description = "鍏ュ簱鏁伴噺")
+ @Excel(name = "鍏ュ簱鏁伴噺")
private BigDecimal stockInNum;
@Schema(description = "鎵瑰彿")
@@ -44,6 +50,7 @@
private String remark;
@Schema(description = "棰勮鏁伴噺")
+ @TableField(exist = false)
private BigDecimal warnNum;
@Schema(description = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
@@ -53,6 +60,7 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍏ュ簱鏃堕棿")
private LocalDateTime createTime;
@Schema(description = "鍒涘缓鐢ㄦ埛")
--
Gitblit v1.9.3