From 68157f39e1d56ce2a44f80620bf33b7510cbb327 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 18 六月 2025 16:55:09 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java
index ec05683..6f9c307 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewDto.java
@@ -24,6 +24,12 @@
private List<FieldParam> fieldParams;
private String fieldParamsEncode;
+ /**
+ * 1: 宸插畬鎴�
+ * 2锛� 閮ㄥ垎瀹屾垚
+ * 0锛� 鏈畬鎴�
+ */
+ private Integer status;
//鍔ㄦ�佹墿灞曞瓧娈�
public transient Map<String, Object> dynamicFields = new HashMap<>();
--
Gitblit v1.9.1