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

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2894,7 +2894,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 x.LatAndLon,
                 x.Developers,
                 x.ProjectType,
-               // ProjectTypeName = x.ProjectType.GetEnumName(),
+                // ProjectTypeName = x.ProjectType.GetEnumName(),
                 x.CarrierSize,
                 x.LayersNum,
                 x.CategoryName,
@@ -2983,7 +2983,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 extModel.ManagementCompany,
                 extModel.BrandDemand,
                 extModel.HonorList,
-                OpenTime= StringHelper.FormatDate(extModel.OpenTime),
+                OpenTime = StringHelper.FormatDate(extModel.OpenTime),
             });
         }
 
@@ -3269,6 +3269,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 PropertyFee = extModel?.PropertyFee ?? 0,
                 RentFee = extModel?.RentFee ?? 0,
                 BannerList = extModel?.BannerList ?? new List<string>(),
+                ETypeName = extModel.ETypeName ?? "",
             };
             return ApiResult.Success(data: result);
         }