From a7f86b6000033c135f233d9fbf4131532b1ff95c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 13 八月 2026 16:27:07 +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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..dea60a2 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
@@ -13,7 +13,7 @@
/**
* ERP 閿�鍞鍗� DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName(value = "erp_sale_order")
@KeySequence("erp_sale_order_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@@ -106,10 +106,6 @@
private BigDecimal depositPrice;
/**
- * 闄勪欢鍦板潃
- */
- private String fileUrl;
- /**
* 澶囨敞
*/
private String remark;
@@ -128,4 +124,16 @@
*/
private Integer outStatus;
+ // ========== 鐢熶骇鍏宠仈 ==========
+
+ /**
+ * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+ */
+ private Integer productionStatus;
+
+ /**
+ * 鐢熶骇瀹屾垚鏃堕棿
+ */
+ private LocalDateTime productionFinishTime;
+
}
\ No newline at end of file
--
Gitblit v1.9.3