From 931f3177fde707b5e7d4670e3fdc3725a772ea88 Mon Sep 17 00:00:00 2001 From: zzz <441185993@qq.com> Date: 星期三, 10 九月 2025 19:43:58 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/FaceLink_AI_250820 --- /dev/null | 0 Server/贾余栋/log/日志_贾余栋_20250910.doc | 0 Client/王斌强/log/日志_王斌强_20250910.doc | 0 Server/.gitignore | 1 + Server/杨岩/log/日志_杨岩_250910.doc | 0 5 files changed, 1 insertions(+), 0 deletions(-) diff --git "a/Client/\345\274\240\346\265\251/log/~$_\345\274\240\346\265\251_20250909.doc" "b/Client/\345\274\240\346\265\251/log/~$_\345\274\240\346\265\251_20250909.doc" deleted file mode 100644 index f830104..0000000 --- "a/Client/\345\274\240\346\265\251/log/~$_\345\274\240\346\265\251_20250909.doc" +++ /dev/null Binary files differ diff --git "a/Client/\345\274\240\351\211\264\351\206\207/log/~$_\345\274\240\351\211\264\351\206\207_250909.doc" "b/Client/\345\274\240\351\211\264\351\206\207/log/~$_\345\274\240\351\211\264\351\206\207_250909.doc" deleted file mode 100644 index 3aa2453..0000000 --- "a/Client/\345\274\240\351\211\264\351\206\207/log/~$_\345\274\240\351\211\264\351\206\207_250909.doc" +++ /dev/null Binary files differ diff --git "a/Client/\347\216\213\346\226\214\345\274\272/log/\346\227\245\345\277\227_\347\216\213\346\226\214\345\274\272_20250910.doc" "b/Client/\347\216\213\346\226\214\345\274\272/log/\346\227\245\345\277\227_\347\216\213\346\226\214\345\274\272_20250910.doc" new file mode 100644 index 0000000..d1afddc --- /dev/null +++ "b/Client/\347\216\213\346\226\214\345\274\272/log/\346\227\245\345\277\227_\347\216\213\346\226\214\345\274\272_20250910.doc" Binary files differ diff --git a/Server/.gitignore b/Server/.gitignore new file mode 100644 index 0000000..315b69c --- /dev/null +++ b/Server/.gitignore @@ -0,0 +1 @@ +~$*.docx diff --git "a/Server/\346\235\250\345\262\251/log/~$_\346\235\250\345\262\251_250909.doc" "b/Server/\346\235\250\345\262\251/log/~$_\346\235\250\345\262\251_250909.doc" deleted file mode 100644 index c8ef0f2..0000000 --- "a/Server/\346\235\250\345\262\251/log/~$_\346\235\250\345\262\251_250909.doc" +++ /dev/null Binary files differ diff --git "a/Server/\346\235\250\345\262\251/log/~WRL0001.tmp" "b/Server/\346\235\250\345\262\251/log/\346\227\245\345\277\227_\346\235\250\345\262\251_250910.doc" similarity index 84% rename from "Server/\346\235\250\345\262\251/log/~WRL0001.tmp" rename to "Server/\346\235\250\345\262\251/log/\346\227\245\345\277\227_\346\235\250\345\262\251_250910.doc" index dccc5f2..a2b7b4f 100644 --- "a/Server/\346\235\250\345\262\251/log/~WRL0001.tmp" +++ "b/Server/\346\235\250\345\262\251/log/\346\227\245\345\277\227_\346\235\250\345\262\251_250910.doc" Binary files differ diff --git "a/Server/\350\264\276\344\275\231\346\240\213/log/\346\227\245\345\277\227_\350\264\276\344\275\231\346\240\213_20250910.doc" "b/Server/\350\264\276\344\275\231\346\240\213/log/\346\227\245\345\277\227_\350\264\276\344\275\231\346\240\213_20250910.doc" new file mode 100644 index 0000000..dc5f240 --- /dev/null +++ "b/Server/\350\264\276\344\275\231\346\240\213/log/\346\227\245\345\277\227_\350\264\276\344\275\231\346\240\213_20250910.doc" Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250901.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250901.doc" deleted file mode 100644 index 416b68d..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250901.doc" +++ /dev/null Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250902.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250902.doc" deleted file mode 100644 index 08a3afd..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250902.doc" +++ /dev/null Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250903.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250903.doc" deleted file mode 100644 index 9913fd6..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250903.doc" +++ /dev/null Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250904.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250904.doc" deleted file mode 100644 index b02e844..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250904.doc" +++ /dev/null Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250905.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250905.doc" deleted file mode 100644 index 8877da8..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250905.doc" +++ /dev/null Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250908.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250908.doc" deleted file mode 100644 index 6603c57..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250908.doc" +++ /dev/null Binary files differ diff --git "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250909.doc" "b/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250909.doc" deleted file mode 100644 index 97fb186..0000000 --- "a/log/\346\227\245\345\277\227_\347\216\213\346\234\235\351\230\263_250909.doc" +++ /dev/null Binary files differ -- Gitblit v1.8.0