From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +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 |    9 ++-------
 1 files changed, 2 insertions(+), 7 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 83b8634..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
@@ -115,21 +115,16 @@
     private String remark;
 
     // ========== 閿�鍞嚭搴� ==========
+
     /**
      * 閿�鍞嚭搴撴暟閲�
      */
     private BigDecimal outCount;
 
-    // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
-    /**
-     * 閿�鍞��璐ф暟閲�
-     */
-    private BigDecimal returnCount;
-
     /**
      * 鍑哄簱鐘舵��
      *
-     * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpSaleOrderOutStatusEnum}
+     * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum}
      */
     private Integer outStatus;
 

--
Gitblit v1.9.3