From 0815d6313177a88f5646fa3235f6eef7462c27cf Mon Sep 17 00:00:00 2001
From: xhm <961547332@qq.com>
Date: 星期六, 28 九月 2024 09:57:11 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/紫鸾PCB_0927

---
 Client/梁唯丛/document/10版本更新.docx                  |    0 
 Client/师皓杰/document/大屏实时显示和系统设置模块.docx           |    0 
 项目.docx                                          |    0 
 存放文档.txt                                         |    0 
 Server/陈文博/document/紫鸾PCB_SOCKET网络搭建(TCP)文档.docx |    0 
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git "a/Client/\345\270\210\347\232\223\346\235\260/document/\345\244\247\345\261\217\345\256\236\346\227\266\346\230\276\347\244\272\345\222\214\347\263\273\347\273\237\350\256\276\347\275\256\346\250\241\345\235\227.docx" "b/Client/\345\270\210\347\232\223\346\235\260/document/\345\244\247\345\261\217\345\256\236\346\227\266\346\230\276\347\244\272\345\222\214\347\263\273\347\273\237\350\256\276\347\275\256\346\250\241\345\235\227.docx"
new file mode 100644
index 0000000..6b542f7
--- /dev/null
+++ "b/Client/\345\270\210\347\232\223\346\235\260/document/\345\244\247\345\261\217\345\256\236\346\227\266\346\230\276\347\244\272\345\222\214\347\263\273\347\273\237\350\256\276\347\275\256\346\250\241\345\235\227.docx"
Binary files differ
diff --git "a/Client/\346\242\201\345\224\257\344\270\233/document/10\347\211\210\346\234\254\346\233\264\346\226\260.docx" "b/Client/\346\242\201\345\224\257\344\270\233/document/10\347\211\210\346\234\254\346\233\264\346\226\260.docx"
new file mode 100644
index 0000000..e5fa68b
--- /dev/null
+++ "b/Client/\346\242\201\345\224\257\344\270\233/document/10\347\211\210\346\234\254\346\233\264\346\226\260.docx"
Binary files differ
diff --git "a/Server/\351\231\210\346\226\207\345\215\232/document/\347\264\253\351\270\276PCB_SOCKET\347\275\221\347\273\234\346\220\255\345\273\272\050TCP\051\346\226\207\346\241\243.docx" "b/Server/\351\231\210\346\226\207\345\215\232/document/\347\264\253\351\270\276PCB_SOCKET\347\275\221\347\273\234\346\220\255\345\273\272\050TCP\051\346\226\207\346\241\243.docx"
new file mode 100644
index 0000000..86b072f
--- /dev/null
+++ "b/Server/\351\231\210\346\226\207\345\215\232/document/\347\264\253\351\270\276PCB_SOCKET\347\275\221\347\273\234\346\220\255\345\273\272\050TCP\051\346\226\207\346\241\243.docx"
Binary files differ
diff --git "a/Server/\351\231\210\346\226\207\345\215\232/document/\345\255\230\346\224\276\346\226\207\346\241\243.txt" "b/\345\255\230\346\224\276\346\226\207\346\241\243.txt"
similarity index 100%
rename from "Server/\351\231\210\346\226\207\345\215\232/document/\345\255\230\346\224\276\346\226\207\346\241\243.txt"
rename to "\345\255\230\346\224\276\346\226\207\346\241\243.txt"
diff --git "a/\351\241\271\347\233\256.docx" "b/\351\241\271\347\233\256.docx"
new file mode 100644
index 0000000..2f1ebb4
--- /dev/null
+++ "b/\351\241\271\347\233\256.docx"
Binary files differ

--
Gitblit v1.8.0