Merge branch 'devops17_caoyanyi_bug' into 'devops17'

* Remove empty. See merge request easycorp/zentaopms!1078
2021-12-22 09:10:44 +00:00
parent 0682282971 80ce63d880
commit 40d37f91f9
1 changed files with 1 additions and 1 deletions
@@ -11,7 +11,7 @@ UPDATE `zt_grouppriv` SET `method`='addReview' where `module`='mr' and `method`=
 ALTER TABLE `zt_repo` ADD `preMerge` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '0' AFTER `extra`;
 ALTER TABLE `zt_repo` ADD `job` mediumint unsigned NOT NULL AFTER `preMerge`;
 ALTER TABLE `zt_mr` ADD `synced` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '1';
-ALTER TABLE `zt_mr` ADD `hasNoConflict ` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '0';
+ALTER TABLE `zt_mr` ADD `hasNoConflict` enum('0','1') COLLATE 'utf8_general_ci' NOT NULL DEFAULT '0';
 ALTER TABLE `zt_mr` ADD `diffs` longtext COLLATE 'utf8_general_ci' NULL AFTER `synced`;
 ALTER TABLE `zt_mr` ADD `removeSourceBranch` ENUM('0','1') NOT NULL DEFAULT '0' AFTER `compileStatus`;