From 353acdfceab45a94d9f5d71e353bd06bf7c2eba6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:41:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 fc7e13f..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,13 +24,13 @@
*/
void saveGlassInfo(List<GlassInfo> glassinfo);
- int getGlassInfoCountByFlowCardId(String flowCardId,int layer);
+// int getGlassInfoCountByFlowCardId(String flowCardId,int layer);
/**
* @return
* 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
*/
- List<Map<String, Object>> getFlowCardId();
+// List<Map<String, Object>> getFlowCardId();
--
Gitblit v1.8.0