From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/pojo/ProductStructure.java | 19 ++++++++-----------
1 files changed, 8 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..602f8be 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)
@@ -58,7 +50,12 @@
/**
* 鍏宠仈BOMid
*/
- private Long bomId;
+ private Integer bomId;
+
+ /**
+ * 鐖惰妭鐐笽D
+ */
+ private Long parentId;
}
--
Gitblit v1.9.3