From 8817c6ab14348b360db70ad748dccb4aef692552 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 16:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/production/pojo/ProductStructure.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
index 4b0231b..34a3ee3 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,16 +42,6 @@
     private String unit;
 
     /**
-     * 鐖剁骇id
-     */
-    private Long parentId;
-
-    /**
-     * 鐩樻暟閲�
-     */
-    private BigDecimal diskQuantity;
-
-    /**
      * 绉熸埛ID
      */
     @TableField(fill = FieldFill.INSERT)
@@ -60,5 +52,8 @@
      */
     private Long bomId;
 
-
+    /**
+     * 鐖惰妭鐐笽D
+     */
+    private Long parentId;
 }

--
Gitblit v1.9.3