From d42f9256b4aab375b6c7897e11e99f07bf5f9c95 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 七月 2026 10:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
index 1b05462..be719e0 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
@@ -128,4 +128,16 @@
      */
     private Integer outStatus;
 
+    // ========== 鐢熶骇鍏宠仈 ==========
+
+    /**
+     * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+     */
+    private Integer productionStatus;
+
+    /**
+     * 鐢熶骇瀹屾垚鏃堕棿
+     */
+    private LocalDateTime productionFinishTime;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3