From 124a6178ae918de05886b52199b7755d4fa1ece3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index 88034cb..81ebd75 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,12 +11,14 @@
@TableName("process_route")
@Data
+@ApiModel(value = "processRoute", description = "宸ヨ壓璺嚎涓昏〃")
public class ProcessRoute {
@ApiModelProperty(value = "搴忓彿")
private Long id;
@ApiModelProperty(value = "浜у搧ID")
+ //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material_sku
private Long productModelId;
@ApiModelProperty(value = "鎻忚堪")
@@ -30,9 +33,18 @@
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 Integer bomId;
+
+ @ApiModelProperty(value = "鐘舵�侊細0-鑽夌锛�1-宸叉壒鍑�")
+ private Boolean status;
+
+ @ApiModelProperty(value = "浜у搧绫诲瀷瀛楀吀缂栫爜")
+ private Long dictCode;
}
--
Gitblit v1.9.3