Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

Junjie

2023-12-25 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a

 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);
            }
        }