From 346288bc38bdab442721d7609caed86d03b9d2d4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 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