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

Mall.Module.TradePavilion/FirstShopListModule.cs

@@ -1077,7 +1077,7 @@ namespace Mall.Module.TradePavilion
                             return "";
                         }
                         List<FormDataItem> elist = JsonHelper.DeserializeObject<List<FormDataItem>>(item.Content);
-                        elist = elist.Where(x => x.CompKey == "ImageUploadComp" || x.CompKey == "VideoUploadComp").ToList();
+                        elist = elist.Where(x => x.CompKey == "ImageUploadComp" || x.CompKey == "VideoUploadComp"||x.CompKey== "CommonUploadComp").ToList();
                         var templistnowPath = Path.Combine(templistPath + enrollModel.ListName + "\\");//路径
                         if (!Directory.Exists(templistnowPath))
                         {