Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Domain/ViewModels/Groups/TourClientListView.cs

@@ -81,6 +81,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public DateTime OperatingTime { get; set; }
 
+        /// <summary>
+        /// 舱位类型
+        /// </summary>
+        public string ShippingSpaceType { get; set; }
+
     }
 
     /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/TourClientListRepository.cs

@@ -84,7 +84,8 @@ SELECT
   tcl.IsAccompany,
   temp.*,
   u.CnName AS Operator,
-  tcl.CreateTime AS OperatingTime
+  tcl.CreateTime AS OperatingTime,
+  ssd.name AS ShippingSpaceType
 FROM
   Grp_TourClientList tcl
   LEFT JOIN (
@@ -108,6 +109,7 @@ FROM
       dc.IsDel = 0
   ) temp ON temp.DcId = tcl.ClientId
   LEFT JOIN Sys_Users u ON tcl.CreateUserId = u.Id
+  LEFT JOIN sys_setdata ssd ON ssd.isdel = 0 AND ssd.id = tcl.ShippingSpaceTypeid
 WHERE
   tcl.IsDel = 0
   AND tcl.DiId = {0}", diId);