From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
index fac6d15..2caa2f2 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -32,7 +34,7 @@
private Long id;
@ApiModelProperty("浜у搧id")
- //product_model
+ //瀹佸-涓洓寤烘潗浣跨敤鏂扮殑浜у搧琛ㄥ叧鑱攑roduct_material_sku
private Long productModelId;
@ApiModelProperty("鎻忚堪")
@@ -51,7 +53,7 @@
private LocalDateTime updateTime;
@ApiModelProperty("鍏宠仈bom鐨刬d")
- private Long bomId;
+ private Integer bomId;
@ApiModelProperty("宸ヨ壓璺嚎缂栫爜")
private String processRouteCode;
--
Gitblit v1.9.3