From bc8cae9b3290096dd1dcad3132108d47ab8d6bc8 Mon Sep 17 00:00:00 2001 From: wangky <m1561510467@163.com> Date: 星期五, 15 十一月 2024 15:12:43 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/烛龙AI_1111_07.17 --- Client/陈楚丹/log/日志_陈楚丹_1114.doc | 0 Server/申烜/log/日志封装_1114.doc | 0 Server/申烜/log/日志封装_1115.doc | 0 Client/刘子航/log/日志_刘子航_1114.doc | 0 Client/宋昊昳/log/日志_宋昊昳_1115.doc | 0 Client/胡家明/log/胡家明_1114.doc | 0 Server/姜可庚/log/姜可庚_1115.doc | 0 Client/马渝杭/log/20241113烛龙AII日报.doc | 0 Client/马渝杭/log/20241114烛龙AII日报.doc | 0 Client/黎弘霖/log/摄像头标注管理_黎弘霖_1115.doc | 0 10 files changed, 0 insertions(+), 0 deletions(-) diff --git "a/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1114.doc" "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1114.doc" new file mode 100644 index 0000000..6a6ece3 --- /dev/null +++ "b/Client/\345\210\230\345\255\220\350\210\252/log/\346\227\245\345\277\227_\345\210\230\345\255\220\350\210\252_1114.doc" Binary files differ diff --git "a/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1115.doc" "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1115.doc" new file mode 100644 index 0000000..44a44fe --- /dev/null +++ "b/Client/\345\256\213\346\230\212\346\230\263/log/\346\227\245\345\277\227_\345\256\213\346\230\212\346\230\263_1115.doc" Binary files differ diff --git "a/Client/\350\203\241\345\256\266\346\230\216/log/\350\203\241\345\256\266\346\230\216_1114.doc" "b/Client/\350\203\241\345\256\266\346\230\216/log/\350\203\241\345\256\266\346\230\216_1114.doc" new file mode 100644 index 0000000..f8aee7c --- /dev/null +++ "b/Client/\350\203\241\345\256\266\346\230\216/log/\350\203\241\345\256\266\346\230\216_1114.doc" Binary files differ diff --git "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" "b/Client/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1114.doc" similarity index 68% copy from "Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" copy to "Client/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1114.doc" index 75292a2..c659fdc 100644 --- "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" +++ "b/Client/\351\231\210\346\245\232\344\270\271/log/\346\227\245\345\277\227_\351\231\210\346\245\232\344\270\271_1114.doc" Binary files differ diff --git "a/Client/\351\251\254\346\270\235\346\235\255/log/20241113\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" "b/Client/\351\251\254\346\270\235\346\235\255/log/20241113\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" new file mode 100644 index 0000000..5e6e122 --- /dev/null +++ "b/Client/\351\251\254\346\270\235\346\235\255/log/20241113\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" Binary files differ diff --git "a/Client/\351\251\254\346\270\235\346\235\255/log/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" "b/Client/\351\251\254\346\270\235\346\235\255/log/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" new file mode 100644 index 0000000..0e43982 --- /dev/null +++ "b/Client/\351\251\254\346\270\235\346\235\255/log/20241114\347\203\233\351\276\231AII\346\227\245\346\212\245.doc" Binary files differ diff --git "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" "b/Client/\351\273\216\345\274\230\351\234\226/log/\346\221\204\345\203\217\345\244\264\346\240\207\346\263\250\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1115.doc" similarity index 69% copy from "Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" copy to "Client/\351\273\216\345\274\230\351\234\226/log/\346\221\204\345\203\217\345\244\264\346\240\207\346\263\250\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1115.doc" index 75292a2..fb1659d 100644 --- "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" +++ "b/Client/\351\273\216\345\274\230\351\234\226/log/\346\221\204\345\203\217\345\244\264\346\240\207\346\263\250\347\256\241\347\220\206_\351\273\216\345\274\230\351\234\226_1115.doc" Binary files differ diff --git "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" "b/Server/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1115.doc" similarity index 77% rename from "Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" rename to "Server/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1115.doc" index 75292a2..57f54a7 100644 --- "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" +++ "b/Server/\345\247\234\345\217\257\345\272\232/log/\345\247\234\345\217\257\345\272\232_1115.doc" Binary files differ diff --git "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" "b/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1114.doc" similarity index 71% copy from "Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" copy to "Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1114.doc" index 75292a2..0cea101 100644 --- "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" +++ "b/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1114.doc" Binary files differ diff --git "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" "b/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1115.doc" similarity index 71% copy from "Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" copy to "Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1115.doc" index 75292a2..0a89014 100644 --- "a/Server/\345\247\234\345\217\257\345\272\232/log/~WRL0001.tmp" +++ "b/Server/\347\224\263\347\203\234/log/\346\227\245\345\277\227\345\260\201\350\243\205_1115.doc" Binary files differ -- Gitblit v1.8.0