Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-19 c3739bbeee3972d27423f6f1d71e2d20c30df240

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