Merge branch 'master' of https://gitee.com/sincere_tour_interaction_group/zhujimajiang_redis

# Conflicts: # .gitignore
5 anos atrás · 2a7c834ce1
--- a/.gitignore
+++ b/.gitignore
@@ -53,5 +53,7 @@
 !libcurl.dll
 !create_dump.dll
 !Collocate.exe
 !MFC71u.dll
 !ServiceCore.dll

 .vs
--- a/俱乐部/Bin/Debug_Unicode/MFC71u.dll
+++ b/俱乐部/Bin/Debug_Unicode/MFC71u.dll
--- a/俱乐部/Bin/Debug_Unicode/ServiceCore.dll
+++ b/俱乐部/Bin/Debug_Unicode/ServiceCore.dll
--- a/俱乐部/Bin/Release_Unicode/ServiceCore.dll
+++ b/俱乐部/Bin/Release_Unicode/ServiceCore.dll
--- a/俱乐部/Publish/Client/Release_Unicode/ServiceCore.dll
+++ b/俱乐部/Publish/Client/Release_Unicode/ServiceCore.dll
--- a/俱乐部/Publish/Server/Release_Unicode/ServiceCore.dll
+++ b/俱乐部/Publish/Server/Release_Unicode/ServiceCore.dll