From 2ba7e15157b43a06f100602d3f3257cb3a06f9e5 Mon Sep 17 00:00:00 2001 From: lzx <2246256235@qq.com> Date: 星期四, 07 十一月 2024 15:07:04 +0800 Subject: [PATCH] erge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025 --- Client/冀浩昶/log/日志_冀浩昶_1107.doc | 0 Server/陈楚丹/log/日志_陈楚丹_1106.doc | 0 kunlun.sql | 8 ++++++++ Client/朱航/log/朱航1105.doc | 0 Client/朱航/log/朱航1106.doc | 0 Client/龚启祥/log/日志模板_龚启祥_1106()新.doc | 0 6 files changed, 8 insertions(+), 0 deletions(-) diff --git "a/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1107.doc" "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1107.doc" new file mode 100644 index 0000000..fb5b723 --- /dev/null +++ "b/Client/\345\206\200\346\265\251\346\230\266/log/\346\227\245\345\277\227_\345\206\200\346\265\251\346\230\266_1107.doc" Binary files differ diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521105.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521105.doc" index 1d30c29..5d34d41 100644 --- "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521105.doc" +++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521105.doc" Binary files differ diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521106.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521106.doc" new file mode 100644 index 0000000..da123aa --- /dev/null +++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521106.doc" Binary files differ diff --git "a/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1106\050\051\346\226\260.doc" "b/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1106\050\051\346\226\260.doc" new file mode 100644 index 0000000..675637e --- /dev/null +++ "b/Client/\351\276\232\345\220\257\347\245\245/log/\346\227\245\345\277\227\346\250\241\346\235\277_\351\276\232\345\220\257\347\245\245_1106\050\051\346\226\260.doc" Binary files differ diff --git "a/Server/\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_1106.doc" "b/Server/\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_1106.doc" new file mode 100644 index 0000000..d11a66b --- /dev/null +++ "b/Server/\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_1106.doc" Binary files differ diff --git a/kunlun.sql b/kunlun.sql index bb9d576..32d9688 100644 --- a/kunlun.sql +++ b/kunlun.sql @@ -209,3 +209,11 @@ /*!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