From d5b46648fdb93d9d052ee9f376723cc48c8c68c3 Mon Sep 17 00:00:00 2001
From: lfp0404 <2796652921@qq.com>
Date: 星期四, 05 十二月 2024 21:56:16 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/脸谱AI_0817_1202
---
/dev/null | 6 ------
GroupB_马喜龙/Server/马喜龙/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/DocumentLayout.json | 23 +++++++++++++++++++++++
GroupA_何敬治/Server/武尧/document/数据库需求文档.doc | 0
GroupA_何敬治/Server/丁伟/document/存放文档.txt | 1 +
GroupB_马喜龙/Server/马喜龙/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Browse.VC.db | 0
GroupB_马喜龙/Server/马喜龙/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Solution.VC.db | 0
GroupB_马喜龙/Server/马喜龙/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/.suo | 0
7 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8a4bf9e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.vs
-/x64
-.vcxproj
-.vcxproj.*
-.git
-GroupA_浣曟暚娌�/
diff --git "a/GroupA_\344\275\225\346\225\254\346\262\273/Server/\344\270\201\344\274\237/document/\345\255\230\346\224\276\346\226\207\346\241\243.txt" "b/GroupA_\344\275\225\346\225\254\346\262\273/Server/\344\270\201\344\274\237/document/\345\255\230\346\224\276\346\226\207\346\241\243.txt"
index e69de29..ed4df3c 100644
--- "a/GroupA_\344\275\225\346\225\254\346\262\273/Server/\344\270\201\344\274\237/document/\345\255\230\346\224\276\346\226\207\346\241\243.txt"
+++ "b/GroupA_\344\275\225\346\225\254\346\262\273/Server/\344\270\201\344\274\237/document/\345\255\230\346\224\276\346\226\207\346\241\243.txt"
@@ -0,0 +1 @@
+666
\ No newline at end of file
diff --git "a/GroupA_\344\275\225\346\225\254\346\262\273/Server/\346\255\246\345\260\247/document/\346\225\260\346\215\256\345\272\223\351\234\200\346\261\202\346\226\207\346\241\243.doc" "b/GroupA_\344\275\225\346\225\254\346\262\273/Server/\346\255\246\345\260\247/document/\346\225\260\346\215\256\345\272\223\351\234\200\346\261\202\346\226\207\346\241\243.doc"
new file mode 100644
index 0000000..0dc3a34
--- /dev/null
+++ "b/GroupA_\344\275\225\346\225\254\346\262\273/Server/\346\255\246\345\260\247/document/\346\225\260\346\215\256\345\272\223\351\234\200\346\261\202\346\226\207\346\241\243.doc"
Binary files differ
diff --git "a/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/.suo" "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/.suo"
new file mode 100644
index 0000000..0c67bf9
--- /dev/null
+++ "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/.suo"
Binary files differ
diff --git "a/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Browse.VC.db" "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Browse.VC.db"
new file mode 100644
index 0000000..239d793
--- /dev/null
+++ "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Browse.VC.db"
Binary files differ
diff --git "a/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/DocumentLayout.json" "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/DocumentLayout.json"
new file mode 100644
index 0000000..7566fa3
--- /dev/null
+++ "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/DocumentLayout.json"
@@ -0,0 +1,23 @@
+{
+ "Version": 1,
+ "WorkspaceRootPath": "D:\\Projects\\\u8138\u8C31AI_0817_1202\\GroupB_\u9A6C\u559C\u9F99\\Server\\\u9A6C\u559C\u9F99\\code\\face_painting_socket_server\\",
+ "Documents": [],
+ "DocumentGroupContainers": [
+ {
+ "Orientation": 0,
+ "VerticalTabListWidth": 256,
+ "DocumentGroups": [
+ {
+ "DockedWidth": 200,
+ "SelectedChildIndex": -1,
+ "Children": [
+ {
+ "$type": "Bookmark",
+ "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Solution.VC.db" "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Solution.VC.db"
new file mode 100644
index 0000000..def4881
--- /dev/null
+++ "b/GroupB_\351\251\254\345\226\234\351\276\231/Server/\351\251\254\345\226\234\351\276\231/code/face_painting_socket_server/.vs/face_painting_socket_server/v17/Solution.VC.db"
Binary files differ
--
Gitblit v1.8.0