solve conflict file

build/usr/local/omc/etc/db/install/sys_post.sql

@@ -0,0 +1,34 @@
+-- MariaDB dump 10.19  Distrib 10.6.16-MariaDB, for debian-linux-gnu (x86_64)
+
+-- Table structure for table `sys_post`
+--
+
+DROP TABLE IF EXISTS `sys_post`;
+CREATE TABLE `sys_post` (
+  `post_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '岗位ID',
+  `post_code` varchar(50) NOT NULL COMMENT '岗位编码',
+  `post_name` varchar(50) NOT NULL COMMENT '岗位名称',
+  `post_sort` int(11) DEFAULT 0 COMMENT '显示顺序',
+  `status` char(1) DEFAULT '0' COMMENT '状态（0停用 1正常）',
+  `create_by` varchar(50) DEFAULT '' COMMENT '创建者',
+  `create_time` bigint(20) DEFAULT 0 COMMENT '创建时间',
+  `update_by` varchar(50) DEFAULT '' COMMENT '更新者',
+  `update_time` bigint(20) DEFAULT 0 COMMENT '更新时间',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`post_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='岗位信息表';
+
+--
+-- Dumping data for table `sys_post`
+--
+
+LOCK TABLES `sys_post` WRITE;
+
+INSERT INTO `sys_post` VALUES (1, 'administator', 'post.admin', 1, '1', 'supervisor', 1697110106499, NULL, 0, NULL);
+INSERT INTO `sys_post` VALUES (2, 'operator', 'post.operator', 2, '1', 'supervisor', 1697110106499, NULL, 0, NULL);
+INSERT INTO `sys_post` VALUES (3, 'monitor', 'post.monitor', 3, '1', 'supervisor', 1697110106499, NULL, 0, NULL);
+INSERT INTO `sys_post` VALUES (4, 'visitor', 'post.visitor', 4, '1', 'supervisor', 1697110106499, NULL, 0, NULL);
+
+UNLOCK TABLES;
+
+-- Dump completed on 2024-03-06 17:27:00