From 3d321d82df16121e1c21fb2113757e5a16de54a2 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp
---
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