From 668e40d51e654104287a3f63c7fd856657a35a11 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期四, 19 十月 2023 11:39:46 +0800 Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs --- 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