From 196dec5ffae084f772dffc0fb1fc4441839f7952 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:59:03 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 3d1a032..31cf274 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -17,6 +17,9 @@
     @ApiModelProperty(value = "鎶ュ伐id")
     private Long productMainId;
 
+    @ApiModelProperty(value = "鐢熶骇鎶ュ伐涓昏〃id")
+    private Long productionProductMainId;
+
     @ApiModelProperty(value = "浜у搧id")
     private Long productModelId;
 
@@ -27,6 +30,10 @@
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
@@ -37,6 +44,10 @@
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
+    @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
 

--
Gitblit v1.9.3