From 0c4b61d3db011bc921f1b00c8e1bfb0367947b30 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 04 八月 2025 17:00:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs b/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs
index c866ce6..8ec9cca 100644
--- a/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs
+++ b/FlexJobApi.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs
@@ -813,7 +813,7 @@
.HasColumnType("uniqueidentifier")
.HasComment("鍒涘缓鎿嶄綔浜�");
- b.Property<int?>("DataPower")
+ b.Property<int>("DataPower")
.HasColumnType("int")
.HasComment("鏁版嵁鏉冮檺");
@@ -821,9 +821,9 @@
.HasColumnType("bit")
.HasComment("鏄惁鍒犻櫎");
- b.Property<Guid>("MenuId")
+ b.Property<Guid>("ResourceId")
.HasColumnType("uniqueidentifier")
- .HasComment("鑿滃崟Id");
+ .HasComment("璧勬簮Id");
b.Property<Guid>("RoleId")
.HasColumnType("uniqueidentifier")
@@ -846,7 +846,7 @@
b.HasKey("Id");
- b.HasIndex("MenuId");
+ b.HasIndex("ResourceId");
b.HasIndex("RoleId");
@@ -1235,8 +1235,9 @@
IsDeleted = false,
IsReal = false,
Name = "绠＄悊鍛�",
+ Password = "iEYggKrMhQ3ASUGLobra1w==:fn/DsMJUbD9FGpvBvR3moMpMPptdxzZlourPVhU479I=",
Sort = 0,
- UserName = "admin"
+ UserName = "system"
});
});
@@ -1813,9 +1814,9 @@
modelBuilder.Entity("FlexJobApi.Core.RoleResource", b =>
{
- b.HasOne("FlexJobApi.Core.Menu", "Menu")
+ b.HasOne("FlexJobApi.Core.Resource", "Resource")
.WithMany()
- .HasForeignKey("MenuId")
+ .HasForeignKey("ResourceId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@@ -1825,7 +1826,7 @@
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
- b.Navigation("Menu");
+ b.Navigation("Resource");
b.Navigation("Role");
});
--
Gitblit v1.9.1