From 3ddf0ec67fe6d9aac2d34fab289fc19d0231bddc Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 14 四月 2025 21:09:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index c8661f6..5e56064 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -119,9 +119,9 @@
public Result<Boolean> cancelTemperingTask() {
boolean result = bigStorageCageDetailsService.cancelTemperingTask();
if (result == true) {
- return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", result);
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲鎴愬姛", result);
} else {
- return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", result);
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲澶辫触", result);
}
}
--
Gitblit v1.8.0