From dcf2c669cac48202ceea2d6917dff89b9a84cb95 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 16 一月 2026 10:19:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/pojo/ProductStructure.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
index dc2528f..de0d605 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
@@ -1,12 +1,14 @@
package com.ruoyi.production.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.math.BigDecimal;
@TableName("product_structure")
@Data
+@ApiModel(value = "ProductStructure", description = "BOM瀛愯〃")
public class ProductStructure {
private static final long serialVersionUID = 1L;
@@ -17,7 +19,7 @@
/**
* 浜у搧鍚嶇О
*/
- private Long productId;
+ private Long productModelId;
/**
* 宸ュ簭id
@@ -40,15 +42,15 @@
private String unit;
/**
- * 鐩樻暟閲�
- */
- private BigDecimal diskQuantity;
-
- /**
* 绉熸埛ID
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 鍏宠仈BOMid
+ */
+ private Long bomId;
+
}
--
Gitblit v1.9.3