Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.DataHelper/Import/BrandHelper.cs

@@ -23,14 +23,16 @@ namespace Mall.DataHelper.Import
         {
             //图片所在的列
             List<int> imgColList = new List<int>();
-            imgColList.Add(1);
+            imgColList.Add(2);
+            imgColList.Add(3);
             List<RB_Brand_Enterprise_Extend> list = new List<RB_Brand_Enterprise_Extend>();
-            DataTable dt = Mall.Common.Plugin.NPOIHelper.ImportYBExceltoDt(fileName, 0, 1, true, imgColList: imgColList, tempFilePath: tempFilePath);
+            Mall.Common.Plugin.ImportExcelNPOIHelper importExcelNPOIHelper = new Common.Plugin.ImportExcelNPOIHelper(tempFilePath);
+            DataTable dt = importExcelNPOIHelper.ExcelToDataTable(fileName, 0, 0, true, imgColList: imgColList);
             if (dt != null && dt.Rows.Count > 0)
             {
                 foreach (DataRow dr in dt.Rows)
                 {
-                   list.Add(DataRowToModel(dr));
+                    list.Add(DataRowToModel(dr));
                 }
             }
             return list;

Mall.WebApi/Controllers/User/TenantController.cs

@@ -2230,7 +2230,7 @@ namespace Mall.WebApi.Controllers.User
         {
             string rootPath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
             string filePath = rootPath + @"\消费品牌.xlsx";
-            string tempPath = rootPath + @"\TempImg";
+            string tempPath = rootPath + @"\TempImport\TempFile";
             var list = BrandHelper.ImportYBBrandData(filePath, tempPath);
             return ApiResult.Success(data: Common.Plugin.JsonHelper.Serialize(list));
         }