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

zhang

2025-07-15 641f7bb8b2d2e23f1f5192fecf030a567151c7b5

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