From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb

---
 screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java b/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
index f2f0cc3..953ccd4 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
@@ -8,4 +8,7 @@
     //5������������insert
     void insertHistoryFiveMinutely();
 
+
+    void insertHistoryFiveMinutely(String yz,String mac);
+
 }

--
Gitblit v1.8.0