From b5e6527c8b3c162340ec3336c3eec0200767c7c9 Mon Sep 17 00:00:00 2001
From: Yao Chunli <56721587@qq.com>
Date: 星期五, 13 五月 2022 08:42:29 +0800
Subject: [PATCH] Merge branch 'dev1' of http://3u015c326.zicp.vip:8111/r/MultiTerminal1 into dev1

---
 MTerm2/MTerm2Doc.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/MTerm2/MTerm2Doc.h b/MTerm2/MTerm2Doc.h
index 513e170..724f64e 100644
--- a/MTerm2/MTerm2Doc.h
+++ b/MTerm2/MTerm2Doc.h
@@ -279,4 +279,6 @@
 	int DoPLCMonitor(); 
 	afx_msg void OnMenuStatusShow();
 	afx_msg void OnMenuFactCfg();
+	afx_msg void OnMenuDatetimeSet();
+	afx_msg void OnMenuEventLog();
 };

--
Gitblit v1.9.1