From 55b94886f07ddd77d0b9ebbbf2d6ff8e92f682a4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 16 七月 2024 16:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index 6d78c74..fd74acf 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -24,16 +24,16 @@
        */
       void saveGlassInfo(List<GlassInfo> glassinfo);
 
-      /**
-       * @param flowCardId
-       * @return 鏍规嵁娴佺▼鍗″彿鏌ヨ鐜荤拑淇℃伅
-       */
-      int getGlassInfoCountByFlowCardId(String flowCardId);
+//      int getGlassInfoCountByFlowCardId(String flowCardId,int layer);
 
       /**
        * @return
        * 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
        */
-      List<Map<String, Object>> getFlowCardId();
+//      List<Map<String, Object>> getFlowCardId();
+
+
+
+
 }
 

--
Gitblit v1.8.0