Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-13 bcb5e464f879458c421069e7d8c72d8c16b4ac7b

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