From b8fb8bb148be787089d3dd9e3c724eae7d186409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=B3=B0?= Date: Tue, 7 Jul 2026 15:25:27 +0800 Subject: [PATCH] resolve confilct YLContext.cs & YLErpDAL.csproj --- YLErpDAL/DataBase/YLContext.cs | 5 +++++ YLErpDAL/YLErpDAL.csproj | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/YLErpDAL/DataBase/YLContext.cs b/YLErpDAL/DataBase/YLContext.cs index b6ed6e6d..78936a0c 100644 --- a/YLErpDAL/DataBase/YLContext.cs +++ b/YLErpDAL/DataBase/YLContext.cs @@ -408,5 +408,10 @@ namespace YLErp.BLL public DbSet tradeContractOaResult { get; set; } public DbSet bondPayment { get; set; } + public DbSet glms_risk_rule { get; set; } + public DbSet glms_risk_rule_application { get; set; } + public DbSet glms_risk_rule_audit_log { get; set; } + public DbSet glms_risk_variable { get; set; } + } } \ No newline at end of file diff --git a/YLErpDAL/YLErpDAL.csproj b/YLErpDAL/YLErpDAL.csproj index 83cf8334..8b50f99f 100644 --- a/YLErpDAL/YLErpDAL.csproj +++ b/YLErpDAL/YLErpDAL.csproj @@ -30,6 +30,8 @@ + + @@ -40,7 +42,7 @@ - +