Merge branch 'master' of https://git.biss.click/biss/Academic-Affairs-System
# Conflicts: # src/Jiaowu.Api/Controllers/TuitionController.cs # src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260822090000_CampusRegistrationPayments.cs # tests/Jiaowu.Api.Tests/MySqlMigrationTests.cs # web/src/views/CampusWalletManagementView.vue # web/src/views/TuitionView.vue
This commit is contained in:
commit
172577f668
17 files changed
+10415
-5
No files matched your search
@@ -314,8 +314,6 @@ public sealed class MySqlMigrationTests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
public void Campus_registration_migration_uses_mysql_safe_foreign_key_names()
|
||||
{
|
||||
using var db = new AppDbContext(CreateMySqlOptions());
|
||||
@@ -343,7 +341,6 @@ public sealed class MySqlMigrationTests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
>>>>>>> Stashed changes
|
||||
public void Application_mysql_connections_allow_migration_user_variables()
|
||||
{
|
||||
var normalized = MySqlConnectionStringPolicy.ForApplication(
|
||||
|
||||
Reference in new issue
Block a user