From 9d620411a629689f84c3379fb3fe42f7fa5d1369 Mon Sep 17 00:00:00 2001
From: cqx <1316027175@qq.com>
Date: 星期四, 08 五月 2025 15:50:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/InduSmartControl4.0

---
 InduSmartControl4.0               |    2 +-
 Server/侯东辰/log/日志_侯东辰_250506 .doc |    0 
 Server/侯东辰/log/日志_侯东辰_250507.doc  |    0 
 3 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/InduSmartControl4.0 b/InduSmartControl4.0
index 550a5a3..a97759e 160000
--- a/InduSmartControl4.0
+++ b/InduSmartControl4.0
@@ -1 +1 @@
-Subproject commit 550a5a3c2789468aacb9a1b7fb714d0af0799fcf
+Subproject commit a97759e04f875c7272d793d3fcdf368d16c7f787
diff --git "a/Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250506.doc" "b/Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250506 .doc"
similarity index 100%
rename from "Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250506.doc"
rename to "Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250506 .doc"
Binary files differ
diff --git "a/Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250507.doc" "b/Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250507.doc"
new file mode 100644
index 0000000..76d8af5
--- /dev/null
+++ "b/Server/\344\276\257\344\270\234\350\276\260/log/\346\227\245\345\277\227_\344\276\257\344\270\234\350\276\260_250507.doc"
Binary files differ

--
Gitblit v1.8.0