From 8f5d87ba7161b0e54dce889bd01d26079355aead Mon Sep 17 00:00:00 2001 From: congmu <congmu2024@163.com> Date: 星期六, 09 十一月 2024 16:14:50 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025 --- kunlun.sql | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/kunlun.sql b/kunlun.sql index bb9d576..26a4d2a 100644 --- a/kunlun.sql +++ b/kunlun.sql @@ -44,21 +44,22 @@ `area` varchar(50) DEFAULT NULL, `longitude` double DEFAULT NULL, `latitude` double DEFAULT NULL, - `purchasing_time` varchar(50) DEFAULT NULL, - `install_time` varchar(50) DEFAULT NULL, + `purchasing_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `install_time` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `manufacturer` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `mark_name` varchar(50) DEFAULT NULL, `mark_time` varchar(50) DEFAULT NULL, + `mark_status` int DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.devices_management_info 鐨勬暟鎹細~5 rows (澶х害) -INSERT INTO `devices_management_info` (`id`, `devices_name`, `devices_type`, `devices_serial_number`, `devices_status`, `area`, `longitude`, `latitude`, `purchasing_time`, `install_time`, `manufacturer`, `mark_name`, `mark_time`) VALUES +-- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.devices_management_info 鐨勬暟鎹細~6 rows (澶х害) +INSERT INTO `devices_management_info` (`id`, `devices_name`, `devices_type`, `devices_serial_number`, `devices_status`, `area`, `longitude`, `latitude`, `purchasing_time`, `install_time`, `manufacturer`, `mark_time`, `mark_status`) VALUES (6, '6', '6', '6', '6', '8', 8, 8, '8', '8', '8', NULL, NULL), (7, '1', '4', '4', '2', '6', 6, 9, '9', '2', '2', NULL, NULL), (8, '1', '2', '3', '2', '3', 2, 2, '3', '3', '1', NULL, NULL), (9, '10', '2', '3', '2', '3', 2, 2, '3', '3', '1', NULL, NULL), - (10, '6', '5', '5', '5', '5', 5, 5, '5', '5', '5', NULL, NULL); + (10, '6', '5', '5', '5', '5', 5, 5, '5', '5', '5', NULL, NULL), + (12, '312', '231', '324', '1321', '312', 312, 321, '2024-01-01', '2024-01-01', '3124', NULL, NULL); -- 瀵煎嚭 琛� mayi_kunlun.month_info 缁撴瀯 CREATE TABLE IF NOT EXISTS `month_info` ( @@ -143,7 +144,7 @@ `id` int NOT NULL AUTO_INCREMENT, `department` varchar(50) DEFAULT NULL, `user_name` varchar(32) DEFAULT NULL, - `password` varchar(32) DEFAULT NULL, + `password` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, `user_no` varchar(10) DEFAULT NULL, `age` int DEFAULT NULL, `sex` varchar(10) DEFAULT NULL, @@ -154,6 +155,7 @@ `login_time` datetime DEFAULT NULL, `register_time` datetime DEFAULT NULL, PRIMARY KEY (`id`), + UNIQUE KEY `unique_constraint_name` (`user_name`), KEY `role_id` (`role_id`), CONSTRAINT `user_info_ibfk_1` FOREIGN KEY (`role_id`) REFERENCES `role_info` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; @@ -202,10 +204,12 @@ PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='璀︽姤鏁版嵁'; --- 姝ｅ湪瀵煎嚭琛� mayi_kunlun.warning_info 鐨勬暟鎹細~0 rows (澶х害) +<<<<<<< HEAD +======= /*!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) */; +>>>>>>> 3037ddc8c6e0519a9e1ae6d0a9cc002033047a02 -- Gitblit v1.8.0