From 609dc04b7262c229653775015ecd4334f679589b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 03 二月 2026 10:21:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

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

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index dae49a7..5286cd3 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -31,6 +31,12 @@
      * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
      */
     @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+    private Long saleLedgerProductId;
+
+    /**
+     * 浜у搧瑙勬牸id
+     */
+    @ApiModelProperty(value = "浜у搧瑙勬牸id")
     private Long productModelId;
 
     /**

--
Gitblit v1.9.3