diff --git a/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs b/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs index 2ed45e9..0fb3bc1 100644 --- a/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs +++ b/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs @@ -113,7 +113,6 @@ namespace VOL.Business.Services.ShangWaiMao return BuildExcel(rawDataList); } - private static byte[] BuildExcel(List rawDataList) { using var package = new ExcelPackage(); diff --git a/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs b/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs index ca3fdcb..b2ea799 100644 --- a/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs +++ b/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs @@ -1,4 +1,5 @@ using System.ComponentModel.DataAnnotations.Schema; +using VOL.Entity.SystemModels; namespace VOL.Entity.DomainModels { @@ -6,7 +7,7 @@ namespace VOL.Entity.DomainModels /// 上外贸体测成绩临时表 /// [Table("temp_tccj")] - public class TempTccj + public class TempTccj : BaseEntity { public string school_year { get; set; } public string school_term { get; set; } diff --git a/VOL.WebApi/appsettings.json b/VOL.WebApi/appsettings.json index 8d71486..4680317 100644 --- a/VOL.WebApi/appsettings.json +++ b/VOL.WebApi/appsettings.json @@ -19,8 +19,8 @@ //"DbConnectionString": "Data Source=DESKTOP-JJQM2OL\\SQLEXPRESS;Initial Catalog=netcoredev;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;", //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20) - "DbConnectionString": "Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;", - // "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", + //"DbConnectionString": "Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;", + "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", //"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;", //"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",