From e2d0f5a72f4a8e72e9c289eadfd6517b9f44f38d Mon Sep 17 00:00:00 2001
From: zhuhang <729713003@qq.com>
Date: 星期六, 09 十一月 2024 15:56:15 +0800
Subject: [PATCH] 总结

---
 kunlun.sql                 |   14 --------------
 Client/朱航/document/总结.docx |    0 
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git "a/Client/\346\234\261\350\210\252/document/\346\200\273\347\273\223.docx" "b/Client/\346\234\261\350\210\252/document/\346\200\273\347\273\223.docx"
new file mode 100644
index 0000000..6cd3495
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/document/\346\200\273\347\273\223.docx"
Binary files differ
diff --git a/kunlun.sql b/kunlun.sql
index 32d9688..c4909fb 100644
--- a/kunlun.sql
+++ b/kunlun.sql
@@ -202,18 +202,4 @@
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='璀︽姤鏁版嵁';
 
--- 姝ｅ湪瀵煎嚭琛�  mayi_kunlun.warning_info 鐨勬暟鎹細~0 rows (澶х害)
 
-/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
-/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
-/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;
-<<<<<<< HEAD
-<<<<<<< HEAD
-z
-=======
-SELECT id,devices_name,longitude,latitude,devices_status FROM devices_management;
->>>>>>> 2e420a0a40cc3fcc62bcb42ee6a25f4ad4f22dd3
-=======
->>>>>>> d4c3d3a2b8a3e1507ca835870073df807cdb87df

--
Gitblit v1.8.0