Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve confilct YLContext.cs & YLErpDAL.csproj

Browse Source
This commit is contained in:
尹峰
2026-07-07 15:25:27 +08:00
parent 879fdbea89
commit b8fb8bb148
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/DataBase/YLContext.cs
+5
View File
@@ -408,5 +408,10 @@ namespace YLErp.BLL
public DbSet<trade_contract_oa_result> tradeContractOaResult { get; set; }
public DbSet<BondPayment> bondPayment { get; set; }
public DbSet<glms_risk_rule> glms_risk_rule { get; set; }
public DbSet<glms_risk_rule_application> glms_risk_rule_application { get; set; }
public DbSet<glms_risk_rule_audit_log> glms_risk_rule_audit_log { get; set; }
public DbSet<glms_risk_variable> glms_risk_variable { get; set; }
}
}
YLErpDAL/YLErpDAL.csproj
+3 -1
View File
@@ -30,6 +30,8 @@
<PackageReference Include="Dapper" Version="2.0.123" />
<PackageReference Include="FluentFTP" Version="45.2.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.12.0" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.10.0" />
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.21.90" />
@@ -40,7 +42,7 @@
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0" />
<PackageReference Include="Qdp.Pricing.Library.Options" Version="1.0.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="YLErp.Office" Version="1.1.2" />
</ItemGroup>