Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Entity/BookingStatusLog.cs

@@ -26,7 +26,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 类别
         /// </summary>
-        public string Gategory { get; set; }
+        public string Category { get; set; }
         /// <summary>
         /// 状态分类
         /// </summary>

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -610,8 +610,8 @@ namespace Myshipping.Application
             foreach (var item in all)
             {
                 //清空原有数据
-                var old = await _repStatuslog.AsQueryable().Where(x => x.BookingId == item.BookingId && x.Gategory == "ship").ToListAsync();
+                var old = await _repStatuslog.AsQueryable().Where(x => x.BookingId == item.BookingId && x.Category == "ship").ToListAsync();
-                await _repStatuslog.DeleteAsync(x => x.BookingId == item.BookingId && x.Gategory == "ship");
+                await _repStatuslog.DeleteAsync(x => x.BookingId == item.BookingId && x.Category == "ship");
                 foreach (var ot in old)
                 {
                     await _statuslogdetail.DeleteAsync(x => x.PId == ot.Id);
@@ -619,7 +619,7 @@ namespace Myshipping.Application
                 //新增数据
                 var bookingStatusLog = new BookingStatusLog();
                 bookingStatusLog.BookingId = item.BookingId;
-                bookingStatusLog.Gategory = "ship";
+                bookingStatusLog.Category = "ship";
                 bookingStatusLog.CreatedTime = DateTime.Now;
                 bookingStatusLog.Status = item.Status;
                 bookingStatusLog.OpTime = item.OpTime;

Myshipping.Application/Service/BookingOrder/Dto/BookingStatusLogDto.cs

@@ -26,7 +26,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// <summary>
         /// 类别
         /// </summary>
-        public string Gategory { get; set; }
+        public string Category { get; set; }
         /// <summary>
         /// 状态分类
         /// </summary>

Myshipping.Report/Myshipping.Report.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>