From 59ad6aed9fc23a494e597eb1dfc30d46dbdd068c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 17 二月 2025 14:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index bdab52c..2dfbb4c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -1,6 +1,7 @@
package com.mes.engineering.controller;
+
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.engineering.entity.Engineering;
@@ -63,7 +64,7 @@
if(work){
return Result.build(200, "鎴愬姛", null);
}else {
- return Result.build(100, "鎴愬姛", null);
+ return Result.build(100, "澶辨晽", null);
}
}
--
Gitblit v1.8.0