1
0

solve conflict file

This commit is contained in:
zhangsz
2024-10-25 14:58:42 +08:00
parent 5cdb82297a
commit 3649afe328
1533 changed files with 77808 additions and 0 deletions

View File

@@ -0,0 +1,28 @@
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
--
-- Table structure for table `ne_state`
--
DROP TABLE IF EXISTS `ne_state`;
CREATE TABLE `ne_state` (
`id` int NOT NULL AUTO_INCREMENT,
`ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`version` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`capability` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`serial_num` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-',
`cpu_usage` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
`mem_usage` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
`disk_space` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL,
`timestamp` datetime NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_ne_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE,
INDEX `idx_timestamp`(`timestamp` ASC) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 8551941 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
SET FOREIGN_KEY_CHECKS=1;