From 830b5f394b6f5c41d259be38272d578467b53cf1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 19 三月 2025 18:55:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/controller/OrderSettleController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..4518961 100644
--- a/src/main/java/com/zy/asrs/controller/OrderSettleController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
@@ -71,7 +71,7 @@
@ManagerAuth
public R update(OrderSettle orderSettle){
if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
orderSettle.setUpdateBy(getUserId());
orderSettle.setUpdateTime(new Date());
@@ -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