修改冲突
continuous-integration/drone/push Build is running Details

IRC_NewDev
hang 2024-11-08 17:16:20 +08:00
commit 7e53c24919
2 changed files with 1 additions and 3 deletions

View File

@ -262,7 +262,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
[Comment("项目术语配置Json字符串")] [Comment("项目术语配置Json字符串")]
[StringLength(2000)] [StringLength(2000)]
public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } = new List<TrialObjectNameConfig>();
//[NotMapped] //[NotMapped]
//public List<TrialObjectNameConfig> TrialObjectNameList => JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(TrialObjectNameConfigStr) ?? new List<TrialObjectNameConfig>(); //public List<TrialObjectNameConfig> TrialObjectNameList => JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(TrialObjectNameConfigStr) ?? new List<TrialObjectNameConfig>();

View File

@ -70,8 +70,6 @@ public class IRaCISDBContext : DbContext
v => string.IsNullOrEmpty(v) ? null : JsonConvert.DeserializeObject<List<TestJsonObject>>(v)); v => string.IsNullOrEmpty(v) ? null : JsonConvert.DeserializeObject<List<TestJsonObject>>(v));
}); });
modelBuilder.Entity<Trial>(entity => modelBuilder.Entity<Trial>(entity =>
{ {
//entity.Property(e => e.TrialObjectNameList).HasConversion(v => v == null ? "[]" : JsonConvert.SerializeObject(v), //entity.Property(e => e.TrialObjectNameList).HasConversion(v => v == null ? "[]" : JsonConvert.SerializeObject(v),