From 4f7488aa49ab6420d25a6f7883ffebccbec9b73a Mon Sep 17 00:00:00 2001 From: 18516761980 <56479841@qq.com> Date: 星期四, 16 六月 2022 15:04:03 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs --- src/main/java/com/zy/asrs/controller/OrderSettleController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderSettleController.java b/src/main/java/com/zy/asrs/controller/OrderSettleController.java index 12cd2dd..3c28a47 100644 --- a/src/main/java/com/zy/asrs/controller/OrderSettleController.java +++ b/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); -- Gitblit v1.9.1