fix(升级SQL): 去掉升级SQL中的冲突内容

去掉升级SQL中的冲突内容
2021-11-05 19:08:55 +08:00 · 2021-11-05 19:08:55 +08:00 · 8ea35c710b
parent 9455a8c1ce
commit 8ea35c710b
1 changed files with 0 additions and 3 deletions
--- a/backend/src/main/resources/db/migration/V98__v1.14.1_release.sql
+++ b/backend/src/main/resources/db/migration/V98__v1.14.1_release.sql
@ -9,8 +9,5 @@ insert into user_group_permission (id, group_id, permission_id, module_id)
 values (UUID(), 'ws_admin', 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR', 'WORKSPACE_PROJECT_MANAGER');
 insert into user_group_permission (id, group_id, permission_id, module_id)
 values (UUID(), 'ws_member', 'WORKSPACE_PROJECT_MANAGER:READ+UPLOAD_JAR', 'WORKSPACE_PROJECT_MANAGER');
-<<<<<<< HEAD
-=======

 ALTER TABLE project ADD COLUMN azure_filter_id varchar(50) NULL COMMENT 'azure 过滤需求的 parent workItem ID';
->>>>>>> 92dace863... feat: azure 支持根据父workItem过滤需求