From 274dd8b724dd4485658e1d2a3f825a007f625bd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 七月 2026 09:10: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 | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 8a9be24..1b05462 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
@@ -43,9 +43,17 @@
/**
* 瀹㈡埛缂栧彿
*
- * 鍏宠仈 {@link ErpCustomerDO#getId()}
+ * 鍏宠仈 CRM 瀹㈡埛 {@link cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO#getId()}
*/
private Long customerId;
+ /**
+ * 鍏宠仈 CRM 鍚堝悓缂栧彿
+ */
+ private Long contractId;
+ /**
+ * CRM 鍚堝悓鍗曞彿
+ */
+ private String contractNo;
/**
* 缁撶畻璐︽埛缂栧彿
*
@@ -106,22 +114,18 @@
*/
private String remark;
- // ========== BPM 娴佺▼瀹℃壒 ==========
- /**
- * BPM 娴佺▼瀹炰緥缂栧彿
- */
- private String processInstanceId;
-
// ========== 閿�鍞嚭搴� ==========
+
/**
* 閿�鍞嚭搴撴暟閲�
*/
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
/**
- * 閿�鍞��璐ф暟閲�
+ * 鍑哄簱鐘舵��
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum}
*/
- private BigDecimal returnCount;
+ private Integer outStatus;
}
\ No newline at end of file
--
Gitblit v1.9.3