Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-02 68de8850d0c2fb4e5efef77ad92275ff05686708

 src/main/java/com/zy/asrs/controller/OrderSettleController.java

@@ -109,7 +109,7 @@
        for (OrderSettle orderSettle : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", orderSettle.getOrderSettle());
            map.put("value", orderSettle.getOrderSettle());
            map.put("value", orderSettle.getSettleName());
            result.add(map);
        }
        return R.ok(result);