From 877504ede165b8c965b6cf6599708e7e48778034 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 15:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/pojo/ProductStructure.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..8a53b2e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
@@ -17,7 +17,7 @@
/**
* 浜у搧鍚嶇О
*/
- private Long productId;
+ private Long productModelId;
/**
* 宸ュ簭id
@@ -40,6 +40,11 @@
private String unit;
/**
+ * 鐖剁骇id
+ */
+ private Long parentId;
+
+ /**
* 鐩樻暟閲�
*/
private BigDecimal diskQuantity;
--
Gitblit v1.9.3