Merge branch 'S01-轨迹中台' into dev

src/SJZY.Track.Repository/OrderRepository.cs

@@ -80,6 +80,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
     /// <returns></returns>
     public async Task<UnifyPageResultDto<TrackOrderVO>> GetPageTrackOrder(GetPageTrackOrderInputVO input)
     {
+        //await Context.Queryable<OrderEntity, OrderTemplateEntity>((a,b)= );
 
         return null;
     }

src/SJZY.Track.Repository/TrackContentRepository.cs

@@ -25,7 +25,7 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
         var detail = await Context.Queryable<TrackContentEntity>()
             .LeftJoin<TrackStatusEntity>((a, b) => a.TrackStatusId==b.Id)
             .LeftJoin<TrackFlagEntity>((a, b, c) => a.TrackFlagId==c.Id)
-            .LeftJoin<VSystemEntity>((a, b, c, d) => a.SubSystemId == b.Id)
+            .LeftJoin<VSystemEntity>((a, b, c, d) => a.SubSystemId == d.Id)
             .Where((a, b, c, d) => a.Id == id)
             .Select((a, b, c, d) => new GetTrackContentDetailVO
             {