From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +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/MergePreviewResultLocDto.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultLocDto.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultLocDto.java
index 500b82c..7261942 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultLocDto.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/MergePreviewResultLocDto.java
@@ -1,16 +1,20 @@
-package com.zy.asrs.wms.asrs.entity.dto;
-
-import lombok.Data;
-
-@Data
-public class MergePreviewResultLocDto {
-
- private Long locId;
-
- private String locNo;
-
- private Long locDetlId;
-
- private Double anfme;
-
-}
+package com.zy.asrs.wms.asrs.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class MergePreviewResultLocDto {
+
+ private Long locId;
+
+ private String locNo;
+
+ private Long locDetlId;
+
+ private Double anfme;
+
+ private Double workQty;
+
+ private Long typeId;
+
+}
--
Gitblit v1.9.1