From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 2064e04..a64a541 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -51,4 +51,70 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty(value = "瀹℃牳鐘舵��")
+ @TableField(value = "audit_status")
+ private Integer auditStatus;
+
+ @ApiModelProperty(value = "瀹℃牳浜篿d")
+ @TableField(value = "audit_user_id")
+ private Long auditUserId;
+
+ @ApiModelProperty(value = "瀹℃牳浜�")
+ @TableField(value = "audit_user_name")
+ private String auditUserName;
+
+ @ApiModelProperty(value = "琚鏍镐汉id")
+ @TableField(value = "sure_audit_user_id")
+ private Long sureAuditUserId;
+
+ @ApiModelProperty(value = "琚鏍镐汉")
+ @TableField(value = "sure_audit_user_name")
+ private String sureAuditUserName;
+
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @TableField(value = "audit_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime auditTime;
+
+ @ApiModelProperty(value = "瀹℃牳鎰忚")
+ @TableField(value = "audit_opinion")
+ private String auditOpinion;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "start_time")
+ private LocalDateTime startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "end_time")
+ private LocalDateTime endTime;
+
+ @TableField(value = "device_id")
+ private Long deviceId;
+
+ @TableField(value = "device_name")
+ private String deviceName;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 鐝粍鎴愬憳鍚嶅瓧
+ */
+ @TableField(value = "team_names")
+ private String teamNames;
+
+ /**
+ * 鐝粍鎴愬憳id
+ */
+ @TableField(value = "team_ids")
+ private String teamIds;
+
}
--
Gitblit v1.9.3