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

Mall.DataHelper/Import/BrandHelper.cs

@@ -24,8 +24,8 @@ 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>();
             Mall.Common.Plugin.ImportExcelNPOIHelper importExcelNPOIHelper = new Common.Plugin.ImportExcelNPOIHelper(tempFilePath);
             DataTable dt = importExcelNPOIHelper.ExcelToDataTable(fileName, 0, 0, true, imgColList: imgColList);

Mall.WebApi/Controllers/User/TenantController.cs

@@ -2232,7 +2232,7 @@ namespace Mall.WebApi.Controllers.User
             string tempPath = rootPath + @"\TempImport\TempFile";
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
 
-            int Type = parms.GetInt("1");
+            int Type = parms.GetInt("Type");
             if (Type == 1)
             {
                 string brandFile = rootPath + @"\消费品牌导入.xlsx";
@@ -2243,7 +2243,6 @@ namespace Mall.WebApi.Controllers.User
             {
                 string carrierFile = rootPath + @"\商业载体导入.xlsx";
                 var carrierList = CarrierHelper.ImportYBCarrierData(carrierFile, tempPath);
-
                 return ApiResult.Success(data: carrierList);
             }
             else if (Type == 3)