From 4a69dbd169795bd4ad82a049444c94d09ca26d67 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 08:49:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index a8a3edf..04c3279 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -53,7 +53,7 @@
UpPattenUsage upPattenUsage= upPattenUsageService.selectedEngineering(engineeringId);
if (upPattenUsage!=null){
log.info("宸蹭繚瀛樿繃");
- return Result.build(200, "宸蹭繚瀛樿繃", 200);
+ return Result.build(200, "宸蹭繚瀛樼殑宸ョ▼", 200);
}else {
List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId);
log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
@@ -62,8 +62,8 @@
List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineeringId);
glassInfoService.saveGlassInfo(glassinfo);
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<Engineering> engineerings= engineeringService.selectEngineering(engineeringId);
- engineeringService.saveEngineering(engineerings);
+ List<Engineering> engineering= engineeringService.selectEngineering(engineeringId);
+ engineeringService.saveEngineering(engineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
optimizeProjectService.changeTask(engineeringId, 200);
return Result.build(200, "", 200);
--
Gitblit v1.8.0