Merge branch 'dev'

epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.6__ic_often_use_function.sql

@@ -20,14 +20,14 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for ic_often_use_function
 -- ----------------------------
-DROP TABLE IF EXISTS `ic_often_use_function`;
+-- DROP TABLE IF EXISTS `ic_often_use_function`;
 CREATE TABLE `ic_often_use_function` (
                                          `ID` varchar(32) NOT NULL,
-                                         `CUSTOMER_ID` varchar(255) NOT NULL COMMENT '客户ID',
+                                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
-                                         `USER_ID` varchar(255) NOT NULL COMMENT '用户ID',
+                                         `USER_ID` varchar(64) NOT NULL COMMENT '用户ID',
-                                         `MENU_ID` varchar(255) NOT NULL COMMENT '菜单ID',
+                                         `MENU_ID` varchar(64) NOT NULL COMMENT '菜单ID',
                                          `SORT` int(11) NOT NULL COMMENT '排序',
-                                         `DEL_FLAG` int(11) NOT NULL COMMENT '删除标记',
+                                         `DEL_FLAG` char(1) NOT NULL COMMENT '删除标记',
                                          `REVISION` varchar(32) NOT NULL COMMENT '乐观锁',
                                          `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
                                          `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.13__ic_individual_category_manage.sql

@@ -20,14 +20,13 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 -- Table structure for ic_individual_category_manage
 -- ----------------------------
-DROP TABLE IF EXISTS `ic_individual_category_manage`;
 CREATE TABLE `ic_individual_category_manage` (
                                                  `ID` varchar(32) NOT NULL COMMENT 'ID',
-                                                 `CUSTOMER_ID` varchar(255) NOT NULL COMMENT '客户ID',
+                                                 `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
-                                                 `USER_ID` varchar(255) NOT NULL COMMENT '用户ID',
+                                                 `USER_ID` varchar(64) NOT NULL COMMENT '用户ID',
                                                  `COLUMN_ID` varchar(255) DEFAULT NULL,
                                                  `SORT` int(11) NOT NULL COMMENT '排序',
-                                                 `DEL_FLAG` int(11) NOT NULL COMMENT '删除标记',
+                                                 `DEL_FLAG` char(1) NOT NULL COMMENT '删除标记',
                                                  `REVISION` varchar(32) NOT NULL COMMENT '乐观锁',
                                                  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
                                                  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',