From 64984c01892d6fe51d8ab550c6a28f2d0e81d6fe Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 17:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/production/pojo/ProductStructure.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
index f66536b..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;
@@ -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