From 1d997b9fd1cc2627a1313be762a76cc7cd37fabe Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 六月 2022 13:25:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/jkasrs' 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