Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -1588,10 +1588,11 @@ namespace Hotline.Api.Controllers.Bi
 				.Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
                 .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
                 .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
-                .GroupBy(x => new { x.OrgId, x.OrgName })
+                .GroupBy(x => new { Time = x.OrderSpecial.CreationTime.ToString("yyyy-MM-dd"), x.OrgId, x.OrgName })
                 .Select(x => new OrderReTransactVo
                 {
-                    OrgId = x.OrgId,
+	                Time = x.OrderSpecial.CreationTime.ToString("yyyy-MM-dd"),
+					OrgId = x.OrgId,
                     OrgName = x.OrgName,
                     Num = SqlFunc.AggregateCount(1)
                 }).MergeTable()

src/Hotline.Share/Dtos/Order/OrderBiDto.cs

@@ -458,6 +458,7 @@ namespace Hotline.Share.Dtos.Order
 
 	public class OrderReTransactVo
 	{
+		public string Time { get; set; }
 		public string OrgName { get; set; }
 
 		public string OrgId { get; set; }