From 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 11:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/controller/OpenController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a24b405..c4489ad 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -79,8 +79,8 @@
Map<String, Object> map = new HashMap<>();
map.put("matnr", detlDto2.getMatnr());
map.put("maktx", detlDto2.getMaktx());
- map.put("owner", detlDto2.getOwner());
- map.put("batch", detlDto2.getBatch());
+// map.put("owner", detlDto2.getOwner());
+// map.put("batch", detlDto2.getBatch());
result.add(map);
}
}
@@ -144,8 +144,8 @@
Map<String, Object> map = new HashMap<>();
map.put("matnr", detlDto2.getMatnr());
map.put("maktx", detlDto2.getMaktx());
- map.put("owner", detlDto2.getOwner());
- map.put("batch", detlDto2.getBatch());
+// map.put("owner", detlDto2.getOwner());
+// map.put("batch", detlDto2.getBatch());
result.add(map);
}
}
--
Gitblit v1.9.1