From 3650353733971d879fce9c1cf27ff77c7e1ae77a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 15 五月 2026 14:13:19 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index badf048..40f9a41 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -14,16 +14,13 @@
@TableId(type = IdType.AUTO)
private Long id;
- @Schema(description = "鎶ュ伐id")
- private Long productMainId;
-
@Schema(description = "鐢熶骇鎶ュ伐涓昏〃id")
private Long productionProductMainId;
@Schema(description = "浜у搧id")
private Long productModelId;
- @Schema(description = "鎶ュ伐鏁伴噺(鎬绘暟閲�)")
+ @Schema(description = "鍚堟牸鏁伴噺")
private BigDecimal quantity;
@Schema(description = "鍒涘缓鏃堕棿")
--
Gitblit v1.9.3