From 360325652d0035502b791050c82a646f9f27c91f Mon Sep 17 00:00:00 2001 From: MYH <2395591599@qq.com> Date: 星期四, 07 十一月 2024 15:07:03 +0800 Subject: [PATCH] log 1107 --- kunlun.sql | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) 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