Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob

zhengyiming

2025-08-04 0c4b61d3db011bc921f1b00c8e1bfb0367947b30

 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");
                });