From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
index 679a81b..aa3bb74 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnsales/MesWmReturnSalesDO.java
@@ -1,20 +1,19 @@
package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
/**
* MES 閿�鍞��璐у崟 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName("mes_wm_return_sales")
@KeySequence("mes_wm_return_sales_seq")
@@ -40,19 +39,23 @@
*/
private String name;
/**
+ * 閿�鍞鍗� ID
+ */
+ private Long saleOrderId;
+ /**
* 閿�鍞鍗曠紪鍙�
*/
private String salesOrderCode;
/**
* 瀹㈡埛 ID
*
- * 鍏宠仈 {@link MesMdClientDO#getId()}
+ * 鍏宠仈 CRM 瀹㈡埛 {@link cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO#getId()}
*/
private Long clientId;
/**
* 閫�璐ф棩鏈�
*/
- private LocalDateTime returnDate;
+ private LocalDate returnDate;
/**
* 閫�璐у師鍥�
*/
--
Gitblit v1.9.3