From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index d55a17d..fe661b3 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -18,6 +18,7 @@
private Long id;
@ApiModelProperty(value = "浜у搧ID")
+ //product_model
private Long productModelId;
@ApiModelProperty(value = "鎻忚堪")
@@ -32,12 +33,12 @@
private LocalDateTime createTime;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "宸ヨ壓璺嚎缂栫爜")
private String processRouteCode;
@ApiModelProperty(value = "BOM鐨処D")
- private Long bomId;
+ private Integer bomId;
}
--
Gitblit v1.9.3