Merge branch 'feature-nxdev' of https://gitea.nxsir.cn/code/IM into feature-nxdev
This commit is contained in:
@@ -53,5 +53,7 @@ public partial class Group
|
||||
|
||||
public virtual User GroupMasterNavigation { get; set; } = null!;
|
||||
|
||||
public virtual ICollection<GroupMember> GroupMembers { get; set; } = new List<GroupMember>();
|
||||
|
||||
public virtual ICollection<GroupRequest> GroupRequests { get; set; } = new List<GroupRequest>();
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public partial class GroupMember
|
||||
/// </summary>
|
||||
public DateTime Created { get; set; }
|
||||
|
||||
public virtual User Group { get; set; } = null!;
|
||||
public virtual Group Group { get; set; } = null!;
|
||||
|
||||
public virtual User User { get; set; } = null!;
|
||||
}
|
||||
|
||||
@@ -432,12 +432,12 @@ public partial class ImContext : DbContext
|
||||
.HasComment("用户编号")
|
||||
.HasColumnType("int(11)");
|
||||
|
||||
entity.HasOne(d => d.Group).WithMany(p => p.GroupMemberGroups)
|
||||
entity.HasOne(d => d.Group).WithMany(p => p.GroupMembers)
|
||||
.HasForeignKey(d => d.GroupId)
|
||||
.OnDelete(DeleteBehavior.ClientSetNull)
|
||||
.HasConstraintName("group_member_ibfk_2");
|
||||
|
||||
entity.HasOne(d => d.User).WithMany(p => p.GroupMemberUsers)
|
||||
entity.HasOne(d => d.User).WithMany(p => p.GroupMembers)
|
||||
.HasForeignKey(d => d.UserId)
|
||||
.OnDelete(DeleteBehavior.ClientSetNull)
|
||||
.HasConstraintName("group_member_ibfk_1");
|
||||
|
||||
@@ -73,9 +73,7 @@ public partial class User
|
||||
|
||||
public virtual ICollection<GroupInvite> GroupInviteInvitedUserNavigations { get; set; } = new List<GroupInvite>();
|
||||
|
||||
public virtual ICollection<GroupMember> GroupMemberGroups { get; set; } = new List<GroupMember>();
|
||||
|
||||
public virtual ICollection<GroupMember> GroupMemberUsers { get; set; } = new List<GroupMember>();
|
||||
public virtual ICollection<GroupMember> GroupMembers { get; set; } = new List<GroupMember>();
|
||||
|
||||
public virtual ICollection<GroupRequest> GroupRequests { get; set; } = new List<GroupRequest>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user