From 6f195be68ebf9334ce92c2c596046739a0f8d420 Mon Sep 17 00:00:00 2001
From: 吴泽林 <1360702799@qq.com>
Date: 星期四, 08 八月 2024 09:37:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/ef-p_pro_24_07_23

---
 Client/胡宵/log/历史查询分析_胡宵_2024.8.7.doc     |    0 
 Client/胡宵/log/~WRL0002.tmp               |    0 
 Server/宗玛帝/log/EF-P日志_宗玛帝_202040803.doc  |    0 
 Client/孟喆/code/Real_time_translation.zip |    0 
 Client/李颖怡/log/日志模板_李颖怡_20240802.doc     |    0 
 Server/宗玛帝/log/~WRL0003.tmp              |    0 
 Client/李颖怡/log/日志模板_李颖怡_20240803.doc     |    0 
 Server/杜润昆/log/日报_杜润昆_0807.doc           |    0 
 Client/孟喆/log/大屏显示日志0807.doc             |    0 
 Client/李颖怡/log/日志模板_李颖怡_20240805.doc     |    0 
 Client/范蓉/log/范蓉_2024.8.7.doc            |    0 
 11 files changed, 0 insertions(+), 0 deletions(-)

diff --git "a/Client/\345\255\237\345\226\206/code/Real_time_translation.zip" "b/Client/\345\255\237\345\226\206/code/Real_time_translation.zip"
new file mode 100644
index 0000000..7d7e5ab
--- /dev/null
+++ "b/Client/\345\255\237\345\226\206/code/Real_time_translation.zip"
Binary files differ
diff --git "a/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc" "b/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc"
new file mode 100644
index 0000000..5c85bf4
--- /dev/null
+++ "b/Client/\345\255\237\345\226\206/log/\345\244\247\345\261\217\346\230\276\347\244\272\346\227\245\345\277\2270807.doc"
Binary files differ
diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc"
new file mode 100644
index 0000000..a9f70d1
--- /dev/null
+++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240802.doc"
Binary files differ
diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc"
new file mode 100644
index 0000000..be0812f
--- /dev/null
+++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240803.doc"
Binary files differ
diff --git "a/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc" "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc"
new file mode 100644
index 0000000..d614abd
--- /dev/null
+++ "b/Client/\346\235\216\351\242\226\346\200\241/log/\346\227\245\345\277\227\346\250\241\346\235\277_\346\235\216\351\242\226\346\200\241_20240805.doc"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" "b/Client/\350\203\241\345\256\265/log/~WRL0002.tmp"
similarity index 80%
rename from "Client/\350\203\241\345\256\265/log/~WRL0001.tmp"
rename to "Client/\350\203\241\345\256\265/log/~WRL0002.tmp"
index 3d300fb..0a8a47f 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp"
+++ "b/Client/\350\203\241\345\256\265/log/~WRL0002.tmp"
Binary files differ
diff --git "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp" "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc"
similarity index 74%
copy from "Client/\350\203\241\345\256\265/log/~WRL0001.tmp"
copy to "Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc"
index 3d300fb..94d17cc 100644
--- "a/Client/\350\203\241\345\256\265/log/~WRL0001.tmp"
+++ "b/Client/\350\203\241\345\256\265/log/\345\216\206\345\217\262\346\237\245\350\257\242\345\210\206\346\236\220_\350\203\241\345\256\265_2024.8.7.doc"
Binary files differ
diff --git "a/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.7.doc" "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.7.doc"
new file mode 100644
index 0000000..b956463
--- /dev/null
+++ "b/Client/\350\214\203\350\223\211/log/\350\214\203\350\223\211_2024.8.7.doc"
Binary files differ
diff --git "a/Server/\345\256\227\347\216\233\345\270\235/log/~WRL3433.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040803.doc"
similarity index 76%
copy from "Server/\345\256\227\347\216\233\345\270\235/log/~WRL3433.tmp"
copy to "Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040803.doc"
index f772c37..f7074db 100644
--- "a/Server/\345\256\227\347\216\233\345\270\235/log/~WRL3433.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/EF-P\346\227\245\345\277\227_\345\256\227\347\216\233\345\270\235_202040803.doc"
Binary files differ
diff --git "a/Server/\345\256\227\347\216\233\345\270\235/log/~WRL3433.tmp" "b/Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
similarity index 80%
rename from "Server/\345\256\227\347\216\233\345\270\235/log/~WRL3433.tmp"
rename to "Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
index f772c37..32bbb70 100644
--- "a/Server/\345\256\227\347\216\233\345\270\235/log/~WRL3433.tmp"
+++ "b/Server/\345\256\227\347\216\233\345\270\235/log/~WRL0003.tmp"
Binary files differ
diff --git "a/Server/\346\235\234\346\266\246\346\230\206/log/\346\227\245\346\212\245_\346\235\234\346\266\246\346\230\206_0807.doc" "b/Server/\346\235\234\346\266\246\346\230\206/log/\346\227\245\346\212\245_\346\235\234\346\266\246\346\230\206_0807.doc"
new file mode 100644
index 0000000..eaed04c
--- /dev/null
+++ "b/Server/\346\235\234\346\266\246\346\230\206/log/\346\227\245\346\212\245_\346\235\234\346\266\246\346\230\206_0807.doc"
Binary files differ

--
Gitblit v1.8.0