From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/production/pojo/ProductInspectionRecord.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductInspectionRecord.java b/src/main/java/com/ruoyi/production/pojo/ProductInspectionRecord.java
index efb5628..96befea 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductInspectionRecord.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductInspectionRecord.java
@@ -65,7 +65,8 @@
private String inspector;
@ApiModelProperty("鍒涘缓浜�")
- private String createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@@ -74,11 +75,19 @@
private LocalDateTime createTime;
@ApiModelProperty("淇敼浜�")
- private String updateUser;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String createUserName;
}
--
Gitblit v1.9.3