From 2aa05de6d43f32820bc6fd21df4bd0202ecae85f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 16 五月 2026 16:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 5e1daef..40f9a41 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -14,9 +14,6 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @Schema(description = "鎶ュ伐id")
-    private Long productMainId;
-
     @Schema(description = "鐢熶骇鎶ュ伐涓昏〃id")
     private Long productionProductMainId;
 

--
Gitblit v1.9.3