From b76c09d2c5f16de0e3777350b8d7ab48ea55aaa8 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 24 五月 2022 10:37:56 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs
---
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