From d89c4f466c0922287ff88d4f61bfba71461cdbf0 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 15:37:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
index 1382e3e..f49e47a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using WIDESEA_Core.Const;
using WIDESEA_Core.Helper;
+using WIDESEA_Core.Seed;
using WIDESEA_Core.Tenants;
namespace WIDESEA_Core.DB
@@ -60,7 +61,7 @@
{
Connection = AppSettings.Get(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
ConnId = MainDb.CurrentDbConnId,
- DbType = DataBaseType.SqlServer
+ DbType = DBContext.DbType,
};
listdatabaseSlaveDB.Add(mainDb);
for (int i = 0; i < list.Count; i++)
@@ -70,7 +71,7 @@
{
Connection = data.ConnectionString,
ConnId = data.TenantId + "",
- DbType = (DataBaseType)data.DbType,
+ DbType = data.DbType,
};
mutiDBOperate.Connection = mutiDBOperate.Connection.DecryptDES(AppSecret.DB);
listdatabaseSlaveDB.Add(mutiDBOperate);
@@ -116,6 +117,6 @@
/// <summary>
/// 鏁版嵁搴撶被鍨�
/// </summary>
- public DataBaseType DbType { get; set; }
+ public DbType DbType { get; set; }
}
}
--
Gitblit v1.9.3