From 967c35a4aea280512b71cca6547e126bcde5a024 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 六月 2024 15:04:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
similarity index 81%
rename from hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
index feefa31..83088d7 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
@@ -15,9 +15,11 @@
List<TemperingGlassInfo> selectWaitingGlass();
- List<TemperingGlassInfo> selectIntoGlass();
+ List<TemperingGlassInfo> selectIntoGlass(int layoutId);
List<TemperingGlassInfo> selectOutGlass();
List<TemperingGlassInfo> selectOverGlass();
+
+ List<TemperingGlassInfo> selectLayoutId();
}
--
Gitblit v1.8.0