From 4849a5172d454dd2f95a956f4662606f5f3a68ff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:43:08 +0800
Subject: [PATCH] 1. 代码合并冲突，重新提交

---
 SourceCode/Bond/Servo/ToolUnits.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/ToolUnits.h b/SourceCode/Bond/Servo/ToolUnits.h
index feeae08..b91ca36 100644
--- a/SourceCode/Bond/Servo/ToolUnits.h
+++ b/SourceCode/Bond/Servo/ToolUnits.h
@@ -15,6 +15,7 @@
 	static CString& floatToString1(float value, CString& strOut);
 	static CString& floatToString3(float value, CString& strOut);
 	static ULONGLONG getTimestamp();
+	static time_t getUnixTimestamp();
 	static void createDir(const char* pszDir);
 	static BOOL copyTextToClipboard(CWnd* pWnd, const CString& strText);
 	static std::string getCurrentExePath();

--
Gitblit v1.9.3