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-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
index 1281884..4c69b80 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/salesnotice/MesWmSalesNoticeDO.java
@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.client.MesMdClientDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -37,13 +36,9 @@
*/
private String name;
/**
- * 閿�鍞鍗曠紪鍙�
- */
- private String salesOrderCode;
- /**
* 瀹㈡埛缂栧彿
*
- * 鍏宠仈 {@link MesMdClientDO#getId()}
+ * 鍏宠仈 CRM 瀹㈡埛 {@link cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO#getId()}
*/
private Long clientId;
/**
@@ -78,6 +73,13 @@
*/
private Integer status;
/**
+ * 鍑哄簱鐘舵��
+ *
+ * 瀛楀吀 {@link DictTypeConstants#MES_WM_OUT_STATUS}
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum}
+ */
+ private Integer outStatus;
+ /**
* 澶囨敞
*/
private String remark;
--
Gitblit v1.9.3