[Merge] merge dev into main (#505)

42organization · Jan 14, 2024 · 9ff3844 · 9ff3844
2 parents f314653 + ed1d638
commit 9ff3844
Show file tree

Hide file tree

Showing 21 changed files with 336 additions and 908 deletions.
diff --git a/...s/db/migration/V3__migration_42gg_5th.sql → ...db/migration/V1.1__migration_42gg_5th.sql b/...s/db/migration/V3__migration_42gg_5th.sql → ...db/migration/V1.1__migration_42gg_5th.sql
diff --git a/src/main/resources/db/migration/V1.1__migration_42gg_v2.sql b/src/main/resources/db/migration/V1.1__migration_42gg_v2.sql
diff --git a/src/main/resources/db/migration/V1.2__team_and_teamuser_cascade.sql b/src/main/resources/db/migration/V1.2__team_and_teamuser_cascade.sql
diff --git a/...3.1__update_tournament_content_column.sql → ...1.2__update_tournament_content_column.sql b/...3.1__update_tournament_content_column.sql → ...1.2__update_tournament_content_column.sql
diff --git a/src/main/resources/db/migration/V1.3__add_prevent_delete_season_trigger.sql b/src/main/resources/db/migration/V1.3__add_prevent_delete_season_trigger.sql
diff --git a/src/main/resources/db/migration/V1.4__pchange_add_is_checked_column.sql b/src/main/resources/db/migration/V1.4__pchange_add_is_checked_column.sql
diff --git a/src/main/resources/db/migration/V1.5__insert_pchange_normal_ppp_result.sql b/src/main/resources/db/migration/V1.5__insert_pchange_normal_ppp_result.sql