From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
Service/HStation.Service.PhartRelation.Core/05-service/00-core/DbFirstHelper.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DbFirstHelper.cs b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DbFirstHelper.cs
index a2376c3..963f5d2 100644
--- a/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DbFirstHelper.cs
+++ b/Service/HStation.Service.PhartRelation.Core/05-service/00-core/DbFirstHelper.cs
@@ -13,7 +13,7 @@
msg = string.Empty;
try
{
- var connectConfig = HStation.PhartRelation.ConfigHelper.PostgreSqlConnectionConfig;
+ var connectConfig = HStation.PhartRelation.ConfigHelper.DefaultConnectionConfig;
if (connectConfig == null)
{
msg = "杩炴帴閰嶇疆鍒濆鍖栧け璐�";
@@ -31,7 +31,7 @@
}
if (column.DataType == StaticConfig.CodeFirst_BigString)
{
- if (HStation.Settings.PhartRelationParasHelper.Xhs.DataBase.DbType == HStation.PhartRelation.DbType.PostgreSql)
+ if (HStation.Settings.PhartRelationParasHelper.PhartRelation.DataBase.DbType == HStation.PhartRelation.DbType.PostgreSql)
{
column.DataType = "character varying";
}
@@ -43,8 +43,7 @@
{
typeof(Yw.Entity.PhartDiagram),
typeof(Yw.Entity.PhartGraph),
- typeof(Entity.XhsPumpMainPhartMapping),
- typeof(Entity.XhsValveMainPhartMapping)
+ typeof(Entity.PhartDiagramRelation)
};
using (var db = new SqlSugarClient(connectConfig))
--
Gitblit v1.9.3