Merge branch 'release-2.2.4' into 'release/v2.2.4'

fix(现场升级错误修改): 现场升级错误修改

See merge request dcuc-tjdsj/app-service!76

dcuc-app-service/src/main/resources/config/mysql/V4_1_0005__alert_column.sql

@@ -2,16 +2,4 @@ ALTER TABLE `t_service_resource`
 ADD COLUMN `service_type`  varchar(20) NULL COMMENT '服务类型' AFTER `manager_unit_code`,
 ADD COLUMN `service_provide_way`  varchar(20) NULL COMMENT '服务提供方式' AFTER `service_type`,
 ADD COLUMN `must_self`  varchar(1) NULL COMMENT '是否自用服务' AFTER `service_provide_way`,
-ADD COLUMN `app_code`  varchar(100) NULL COMMENT '服务提供应用系统code' AFTER `must_self`;
-
-ALTER TABLE `t_service_resource`
-ADD COLUMN `remark`  varchar(255) NULL COMMENT '服务资源描述' AFTER `app_code`;
-
-
-ALTER TABLE `t_apply_info`
-ADD COLUMN `app_ops_dep_name`  varchar(255) NULL COMMENT '应用系统运维单位名称' AFTER `manager_org_name`,
-ADD COLUMN `manager_org_code`  varchar(255) NULL COMMENT '应用系统事权单位代码' AFTER `app_ops_dep_name`;
-
-ALTER TABLE `t_apply_info`
-ADD COLUMN `app_english_name`  varchar(100) NULL COMMENT '应用英文名称' AFTER `manager_org_code`,
-ADD COLUMN `line_time`  varchar(100) NULL COMMENT '上线日期' AFTER `app_english_name`;
+ADD COLUMN `app_code`  varchar(100) NULL COMMENT '服务提供应用系统code' AFTER `must_self`;

dcuc-app-service/src/main/resources/config/mysql/V4_1_0006__sub_auth_init.sql

@@ -83,6 +83,18 @@ CREATE TABLE T_APP_FIELD_CLA(
     PRIMARY KEY (ID)
 )ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = '字段分类分类表 ';
 
+ALTER TABLE `t_service_resource`
+ADD COLUMN `remark`  varchar(255) NULL COMMENT '服务资源描述' AFTER `app_code`;
+
+
+ALTER TABLE `t_apply_info`
+ADD COLUMN `app_ops_dep_name`  varchar(255) NULL COMMENT '应用系统运维单位名称' AFTER `manager_org_name`,
+ADD COLUMN `manager_org_code`  varchar(255) NULL COMMENT '应用系统事权单位代码' AFTER `app_ops_dep_name`;
+
+ALTER TABLE `t_apply_info`
+ADD COLUMN `app_english_name`  varchar(100) NULL COMMENT '应用英文名称' AFTER `manager_org_code`,
+ADD COLUMN `line_time`  varchar(100) NULL COMMENT '上线日期' AFTER `app_english_name`;
+
 ALTER TABLE T_APP_FIELD_CLA ADD INDEX IDX_T_APP_FIELD_CLA_FIR(FIR_ID);
 ALTER TABLE T_APP_FIELD_CLA ADD INDEX IDX_T_APP_FIELD_CLA_CODE(CODE);
 ALTER TABLE T_APPLY_INFO CHANGE `manager_org_code` `org_code`  varchar(100) NULL COMMENT '事权机构代码';