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/resource.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/MTerm2/resource.h b/MTerm2/resource.h
index c370656..c8b2c8a 100644
--- a/MTerm2/resource.h
+++ b/MTerm2/resource.h
@@ -498,6 +498,9 @@
 #define ID_MENU_PLC_INFO_SHOW           33078
 #define ID_33079                        33079
 #define ID_MENU_FACT_CFG                33080
+#define ID_DATETIME_SET                 33081
+#define ID_MENU_DATETIME_SET            33082
+#define ID_MENU_EVENT_LOG               33083
 #define ID_INDICATOR_SEL_TYPE           59135
 #define ID_INDICATOR_MACHINE_TYPE       59142
 #define ID_INDICATOR_PROGRAM_POS        59143
@@ -512,7 +515,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        349
-#define _APS_NEXT_COMMAND_VALUE         33081
+#define _APS_NEXT_COMMAND_VALUE         33084
 #define _APS_NEXT_CONTROL_VALUE         1061
 #define _APS_NEXT_SYMED_VALUE           318
 #endif

--
Gitblit v1.9.1