From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 20:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

---
 src/main/java/com/zy/common/model/OrderMergeVo.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/model/OrderMergeVo.java b/src/main/java/com/zy/common/model/OrderMergeVo.java
index bb619d4..3b27d1e 100644
--- a/src/main/java/com/zy/common/model/OrderMergeVo.java
+++ b/src/main/java/com/zy/common/model/OrderMergeVo.java
@@ -22,6 +22,12 @@
 
     private Double anfme;
 
+    //閿�鍞鍗曞彿
+    private String csocode;
+
+    //閿�鍞鍗曡鍙�
+    private String isoseq;
+
     private List<OrderDto> orderDtos = new ArrayList<>();
 
     public OrderMergeVo(String matnr, String batch, Double anfme) {

--
Gitblit v1.9.1