Commit dd43f577 authored by 黄奎's avatar 黄奎

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into HK

parents 47811785 64e492b6
...@@ -395,7 +395,8 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -395,7 +395,8 @@ namespace Mall.WebApi.Controllers.Reserve
IsReceive = x.MemberNum > 0 ? 1 : 0, IsReceive = x.MemberNum > 0 ? 1 : 0,
UseTypeStr = ((int)x.UseType == 3 || (int)x.UseType == 4) ? x.UseType.GetEnumName() : (x.ProductList != null && x.ProductList.Any() ? string.Join("、", x.ProductList.Select(x => x.Relevance)) : ""), UseTypeStr = ((int)x.UseType == 3 || (int)x.UseType == 4) ? x.UseType.GetEnumName() : (x.ProductList != null && x.ProductList.Any() ? string.Join("、", x.ProductList.Select(x => x.Relevance)) : ""),
x.UseType, x.UseType,
x.ProductList x.ProductList,
x.HeXiao
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment