From 4c0dd9a91d834bbbe143d862c28c8c947d2bbd1a Mon Sep 17 00:00:00 2001
From: swl <787657154@qq.com>
Date: 星期一, 14 十月 2024 09:40:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/紫鸾PCB_0927

---
 Client/张文卓/log/张文卓.10.11.docx          |    0 
 Server/付龙玺/log/日志模板_付龙玺_2024_10_12.doc |    0 
 Client/刘万华/log/liuwanhua_10.14.doc     |    0 
 数据库汇总/数据库建表代码备份.docx                   |    0 
 结构体汇总/结构体汇总.docx                       |    0 
 Server/付龙玺/log/日志模板_付龙玺_2024_10_14.doc |    0 
 Client/师皓杰/log/师皓杰_10.11.doc           |    0 
 Client/谢虹铭/log/紫鸾PCB_谢虹铭_202410012.doc |    0 
 Client/刘万华/log/liuwanhua_10.12.doc     |    0 
 Server/左锐/log/日志_左锐_20241012.doc       |    0 
 /dev/null                              |    0 
 自定义功能结构体记录.txt                         |    2 +-
 Client/刘金佩/log/刘金佩_10.11.doc           |    0 
 Server/张准/log/张准_10.11.doc             |    0 
 Client/王凯航/log/wkh-2024-10-12.doc      |    0 
 Client/骆浩/log/骆浩_2024.10.11.docx       |    0 
 Server/付龙玺/log/~WRL0004.tmp            |    0 
 Client/梁唯丛/log/粱唯丛_20241011.doc        |    0 
 Server/陈文博/log/陈文博_2410114.doc         |    0 
 Client/陈嘉伟/log/陈嘉伟_10.11.doc           |    0 
 Client/张文卓/log/张文卓.10.09.docx          |    0 
 21 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/Client/\345\210\230\344\270\207\345\215\216/log/liuwanhua_10.12.doc" "b/Client/\345\210\230\344\270\207\345\215\216/log/liuwanhua_10.12.doc"
new file mode 100644
index 0000000..511a88d
--- /dev/null
+++ "b/Client/\345\210\230\344\270\207\345\215\216/log/liuwanhua_10.12.doc"
Binary files differ
diff --git "a/Client/\345\210\230\344\270\207\345\215\216/log/liuwanhua_10.14.doc" "b/Client/\345\210\230\344\270\207\345\215\216/log/liuwanhua_10.14.doc"
new file mode 100644
index 0000000..586a9f2
--- /dev/null
+++ "b/Client/\345\210\230\344\270\207\345\215\216/log/liuwanhua_10.14.doc"
Binary files differ
diff --git "a/Client/\345\210\230\351\207\221\344\275\251/log/\345\210\230\351\207\221\344\275\251_10.11.doc" "b/Client/\345\210\230\351\207\221\344\275\251/log/\345\210\230\351\207\221\344\275\251_10.11.doc"
new file mode 100644
index 0000000..d5e2e58
--- /dev/null
+++ "b/Client/\345\210\230\351\207\221\344\275\251/log/\345\210\230\351\207\221\344\275\251_10.11.doc"
Binary files differ
diff --git "a/Client/\345\270\210\347\232\223\346\235\260/log/\345\270\210\347\232\223\346\235\260_10.11.doc" "b/Client/\345\270\210\347\232\223\346\235\260/log/\345\270\210\347\232\223\346\235\260_10.11.doc"
new file mode 100644
index 0000000..26c66f6
--- /dev/null
+++ "b/Client/\345\270\210\347\232\223\346\235\260/log/\345\270\210\347\232\223\346\235\260_10.11.doc"
Binary files differ
diff --git "a/Client/\345\274\240\346\226\207\345\215\223/log/\345\274\240\346\226\207\345\215\223.10.09.docx" "b/Client/\345\274\240\346\226\207\345\215\223/log/\345\274\240\346\226\207\345\215\223.10.09.docx"
new file mode 100644
index 0000000..77b09ed
--- /dev/null
+++ "b/Client/\345\274\240\346\226\207\345\215\223/log/\345\274\240\346\226\207\345\215\223.10.09.docx"
Binary files differ
diff --git "a/Client/\345\274\240\346\226\207\345\215\223/log/\345\274\240\346\226\207\345\215\223.10.11.docx" "b/Client/\345\274\240\346\226\207\345\215\223/log/\345\274\240\346\226\207\345\215\223.10.11.docx"
new file mode 100644
index 0000000..7b2646e
--- /dev/null
+++ "b/Client/\345\274\240\346\226\207\345\215\223/log/\345\274\240\346\226\207\345\215\223.10.11.docx"
Binary files differ
diff --git "a/Client/\346\242\201\345\224\257\344\270\233/log/\347\262\261\345\224\257\344\270\233_20241011.doc" "b/Client/\346\242\201\345\224\257\344\270\233/log/\347\262\261\345\224\257\344\270\233_20241011.doc"
new file mode 100644
index 0000000..eab729f
--- /dev/null
+++ "b/Client/\346\242\201\345\224\257\344\270\233/log/\347\262\261\345\224\257\344\270\233_20241011.doc"
Binary files differ
diff --git "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp" "b/Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-12.doc"
similarity index 60%
copy from "Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
copy to "Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-12.doc"
index b845c16..cb41834 100644
--- "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
+++ "b/Client/\347\216\213\345\207\257\350\210\252/log/wkh-2024-10-12.doc"
Binary files differ
diff --git "a/Client/\350\260\242\350\231\271\351\223\255/log/\347\264\253\351\270\276PCB_\350\260\242\350\231\271\351\223\255_202410012.doc" "b/Client/\350\260\242\350\231\271\351\223\255/log/\347\264\253\351\270\276PCB_\350\260\242\350\231\271\351\223\255_202410012.doc"
new file mode 100644
index 0000000..a817a6a
--- /dev/null
+++ "b/Client/\350\260\242\350\231\271\351\223\255/log/\347\264\253\351\270\276PCB_\350\260\242\350\231\271\351\223\255_202410012.doc"
Binary files differ
diff --git "a/Client/\351\231\210\345\230\211\344\274\237/log/\351\231\210\345\230\211\344\274\237_10.11.doc" "b/Client/\351\231\210\345\230\211\344\274\237/log/\351\231\210\345\230\211\344\274\237_10.11.doc"
new file mode 100644
index 0000000..3b3b565
--- /dev/null
+++ "b/Client/\351\231\210\345\230\211\344\274\237/log/\351\231\210\345\230\211\344\274\237_10.11.doc"
Binary files differ
diff --git "a/Client/\351\252\206\346\265\251/log/\351\252\206\346\265\251_2024.10.11.docx" "b/Client/\351\252\206\346\265\251/log/\351\252\206\346\265\251_2024.10.11.docx"
new file mode 100644
index 0000000..caba02a
--- /dev/null
+++ "b/Client/\351\252\206\346\265\251/log/\351\252\206\346\265\251_2024.10.11.docx"
Binary files differ
diff --git "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp" "b/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0004.tmp"
similarity index 61%
copy from "Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
copy to "Server/\344\273\230\351\276\231\347\216\272/log/~WRL0004.tmp"
index b845c16..e109984 100644
--- "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
+++ "b/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0004.tmp"
Binary files differ
diff --git "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp" "b/Server/\344\273\230\351\276\231\347\216\272/log/\346\227\245\345\277\227\346\250\241\346\235\277_\344\273\230\351\276\231\347\216\272_2024_10_12.doc"
similarity index 61%
copy from "Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
copy to "Server/\344\273\230\351\276\231\347\216\272/log/\346\227\245\345\277\227\346\250\241\346\235\277_\344\273\230\351\276\231\347\216\272_2024_10_12.doc"
index b845c16..e109984 100644
--- "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
+++ "b/Server/\344\273\230\351\276\231\347\216\272/log/\346\227\245\345\277\227\346\250\241\346\235\277_\344\273\230\351\276\231\347\216\272_2024_10_12.doc"
Binary files differ
diff --git "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp" "b/Server/\344\273\230\351\276\231\347\216\272/log/\346\227\245\345\277\227\346\250\241\346\235\277_\344\273\230\351\276\231\347\216\272_2024_10_14.doc"
similarity index 61%
rename from "Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
rename to "Server/\344\273\230\351\276\231\347\216\272/log/\346\227\245\345\277\227\346\250\241\346\235\277_\344\273\230\351\276\231\347\216\272_2024_10_14.doc"
index b845c16..d0da670 100644
--- "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
+++ "b/Server/\344\273\230\351\276\231\347\216\272/log/\346\227\245\345\277\227\346\250\241\346\235\277_\344\273\230\351\276\231\347\216\272_2024_10_14.doc"
Binary files differ
diff --git "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp" "b/Server/\345\267\246\351\224\220/log/\346\227\245\345\277\227_\345\267\246\351\224\220_20241012.doc"
similarity index 60%
copy from "Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
copy to "Server/\345\267\246\351\224\220/log/\346\227\245\345\277\227_\345\267\246\351\224\220_20241012.doc"
index b845c16..a554825 100644
--- "a/Server/\344\273\230\351\276\231\347\216\272/log/~WRL0005.tmp"
+++ "b/Server/\345\267\246\351\224\220/log/\346\227\245\345\277\227_\345\267\246\351\224\220_20241012.doc"
Binary files differ
diff --git "a/Server/\345\274\240\345\207\206/log/\345\274\240\345\207\206_10.11.doc" "b/Server/\345\274\240\345\207\206/log/\345\274\240\345\207\206_10.11.doc"
new file mode 100644
index 0000000..7253e96
--- /dev/null
+++ "b/Server/\345\274\240\345\207\206/log/\345\274\240\345\207\206_10.11.doc"
Binary files differ
diff --git "a/Server/\351\231\210\346\226\207\345\215\232/log/\351\231\210\346\226\207\345\215\232_2410114.doc" "b/Server/\351\231\210\346\226\207\345\215\232/log/\351\231\210\346\226\207\345\215\232_2410114.doc"
new file mode 100644
index 0000000..9a3a672
--- /dev/null
+++ "b/Server/\351\231\210\346\226\207\345\215\232/log/\351\231\210\346\226\207\345\215\232_2410114.doc"
Binary files differ
diff --git "a/\346\225\260\346\215\256\345\272\223\346\261\207\346\200\273/\346\225\260\346\215\256\345\272\223\345\273\272\350\241\250\344\273\243\347\240\201\345\244\207\344\273\275.docx" "b/\346\225\260\346\215\256\345\272\223\346\261\207\346\200\273/\346\225\260\346\215\256\345\272\223\345\273\272\350\241\250\344\273\243\347\240\201\345\244\207\344\273\275.docx"
index a01789d..f8b9e68 100644
--- "a/\346\225\260\346\215\256\345\272\223\346\261\207\346\200\273/\346\225\260\346\215\256\345\272\223\345\273\272\350\241\250\344\273\243\347\240\201\345\244\207\344\273\275.docx"
+++ "b/\346\225\260\346\215\256\345\272\223\346\261\207\346\200\273/\346\225\260\346\215\256\345\272\223\345\273\272\350\241\250\344\273\243\347\240\201\345\244\207\344\273\275.docx"
Binary files differ
diff --git "a/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/~$\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx" "b/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/~$\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx"
deleted file mode 100644
index cd0fad2..0000000
--- "a/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/~$\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx"
+++ /dev/null
Binary files differ
diff --git "a/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx" "b/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx"
index e358501..b8e51cb 100644
--- "a/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx"
+++ "b/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273/\347\273\223\346\236\204\344\275\223\346\261\207\346\200\273.docx"
Binary files differ
diff --git "a/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt" "b/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt"
index 73ad27f..7eaebbd 100644
--- "a/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt"
+++ "b/\350\207\252\345\256\232\344\271\211\345\212\237\350\203\275\347\273\223\346\236\204\344\275\223\350\256\260\345\275\225.txt"
@@ -82,7 +82,7 @@
 				int history;
 				int map_change;
 				int device_manage;
-				int pro_plan; // 鐢熸垚璁″垝
+				int pro_plan;  // 鐢熸垚璁″垝
 				int warning;
 				int sto_manage; // 搴撳瓨鍏宠仈
 			};

--
Gitblit v1.8.0