From 781d6610681c227c6440d72794c6721e47fc13dc Mon Sep 17 00:00:00 2001
From: wangky <m1561510467@163.com>
Date: 星期四, 07 十一月 2024 16:37:20 +0800
Subject: [PATCH] 1

---
 Server/王琨元/code/MysqlConn.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git "a/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h" "b/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h"
index 53bb3fc..7e83a2b 100644
--- "a/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h"
+++ "b/Server/\347\216\213\347\220\250\345\205\203/code/MysqlConn.h"
@@ -41,9 +41,17 @@
 private:
 
 	void freeRes();
+<<<<<<< HEAD
+	MYSQL* m_mysql;
+	MYSQL_RES* m_res;
+	MYSQL_ROW m_row;
+	chrono::steady_clock::time_point  m_activeTime;
+
+=======
 	MYSQL* mysql_ = NULL ;
 	MYSQL_RES* res_ = NULL;
 	MYSQL_ROW row_ = nullptr;
 	std::chrono::steady_clock::time_point  activeTime_;
+>>>>>>> eadb2439512aec3f324b6e75f09b525e8da33edb
 };
 

--
Gitblit v1.8.0