From 387d3aca6fab1a07618bb8342ee522b3da2db9b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 28 四月 2024 10:09:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 17469e8..e29849f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -310,7 +310,7 @@
return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�");
}
if (!getDistributeLock()) {
- return Result.error("宸ュ崟涓嬪彂涓紝璇风◢鍚庨噸璇�");
+ return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
}
try {
new LambdaUpdateChainWrapper<>(baseMapper)
@@ -352,7 +352,7 @@
.in(WorkOrder::getId, query.getIds())
.update();
addDistributeRecord(query.getIds(), distributeWayEnum);
- return Result.ok("鎿嶄綔鎴愬姛");
+ return Result.ok("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
} finally {
--
Gitblit v1.8.0