From eb23b15acb15aae43b336ecf5ffb2053bcf85464 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 九月 2025 18:05:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
index 4d4f876..0a17cc6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.model;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -54,5 +55,13 @@
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "发送时间")
+    @TableField("send_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime sendTime;
+
+
+    @ApiModelProperty(value = "入库操作人")
+    private String warehousingUserId;
 
 }

--
Gitblit v1.7.1