Merge remote-tracking branch 'origin/dev' into dev

config/db/V2.3__addindex.sql

@@ -1,17 +1,3 @@
--- 删除索引
-alter table `tb_resource_collection` drop index `resourceid`;
-alter table `tb_resource_car` drop index `resourceid`;
-alter table `tb_resource_score` drop index `resourceid`;
-alter table `tb_resource_browse` drop index `resourceid`;
-alter table `t_ability_application` drop index `resourceid`;
-alter table `t_ability_application` drop index `userId`;
-alter table `tb_data_resource` drop index `type`;
-alter table `tb_data_attr` drop index `attr_value`;
-alter table `tb_data_resource` drop index `name`;
-alter table `tb_data_resource` drop index `deptId`;
-alter table `sys_dept` drop index `type`;
-alter table `sys_dept` drop index `district`;
-alter table `tb_resource_collection` drop index `userId`;
 -- 创建索引
 alter table `tb_resource_collection` ADD INDEX `resourceid`(`resource_id`) USING BTREE comment '收藏的资源id';
 alter table `tb_resource_car` ADD INDEX `resourceid`(`resource_id`) USING BTREE comment '加入申购车的id';

config/db/V2.6__ability_application_add_col.sql

@@ -1 +1 @@
-ALTER TABLE t_ability_application ADD COLUMN `cameraList` json NULL COMMENT '摄像头ID数组';
+ALTER TABLE t_ability_application ADD COLUMN `camera_list` json NULL COMMENT '摄像头ID数组';

config/db/V2.7__t_ability_application_add_col.sql

@@ -1,5 +1,5 @@
 alter table `t_ability_application`
-ADD COLUMN `title` longtext NULL comment '能力申请标题' AFTER `cameraList`,
+ADD COLUMN `title` longtext NULL comment '能力申请标题',
 ADD COLUMN `application_system` varchar(255) NULL comment '应用系统' AFTER `title`,
 ADD COLUMN `application_scene` varchar(255) NULL comment '应用场景' AFTER `application_system`,
 ADD COLUMN `application_background` longtext NULL comment '应用背景' AFTER `application_scene`,

config/db/V2.8__tb_resource_car_update_note1.sql

@@ -0,0 +1 @@
+ALTER TABLE tb_resource_car MODIFY COLUMN `note1` json NULL COMMENT '摄像头ID列表';

config/db/V2.9__t_ability_application_update_col.sql

@@ -0,0 +1,2 @@
+alter table `t_ability_application`
+MODIFY COLUMN `application_scene` json NULL comment '应用场景';

renren-admin/src/main/resources/db/V2.3__addindex.sql

@@ -1,17 +1,3 @@
--- 删除索引
-alter table `tb_resource_collection` drop index `resourceid`;
-alter table `tb_resource_car` drop index `resourceid`;
-alter table `tb_resource_score` drop index `resourceid`;
-alter table `tb_resource_browse` drop index `resourceid`;
-alter table `t_ability_application` drop index `resourceid`;
-alter table `t_ability_application` drop index `userId`;
-alter table `tb_data_resource` drop index `type`;
-alter table `tb_data_attr` drop index `attr_value`;
-alter table `tb_data_resource` drop index `name`;
-alter table `tb_data_resource` drop index `deptId`;
-alter table `sys_dept` drop index `type`;
-alter table `sys_dept` drop index `district`;
-alter table `tb_resource_collection` drop index `userId`;
 -- 创建索引
 alter table `tb_resource_collection` ADD INDEX `resourceid`(`resource_id`) USING BTREE comment '收藏的资源id';
 alter table `tb_resource_car` ADD INDEX `resourceid`(`resource_id`) USING BTREE comment '加入申购车的id';

renren-admin/src/main/resources/db/V2.7__t_ability_application_add_col.sql

@@ -1,5 +1,5 @@
 alter table `t_ability_application`
-ADD COLUMN `title` longtext NULL comment '能力申请标题' AFTER `cameraList`,
+ADD COLUMN `title` longtext NULL comment '能力申请标题',
 ADD COLUMN `application_system` varchar(255) NULL comment '应用系统' AFTER `title`,
 ADD COLUMN `application_scene` varchar(255) NULL comment '应用场景' AFTER `application_system`,
 ADD COLUMN `application_background` longtext NULL comment '应用背景' AFTER `application_scene`,