Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ad3bf02ccd
@ -28,7 +28,7 @@ public class GetTrackFlagListVO
|
||||
/// <summary>
|
||||
/// 应用
|
||||
/// </summary>
|
||||
public string AppName { get; set; }
|
||||
public string App { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 代码
|
||||
|
||||
@ -50,7 +50,7 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
|
||||
.Select((a, b, c, d) => new GetTrackFlagListVO
|
||||
{
|
||||
Id = a.Id,
|
||||
AppName = b.Name,
|
||||
App = b.Name,
|
||||
Code = a.Code,
|
||||
Flag = a.Name,
|
||||
IsToMq = a.IsToMq,
|
||||
|
||||
@ -50,6 +50,7 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
|
||||
.Select((a, b, d) => new GetTrackStatusListVO
|
||||
{
|
||||
Id = a.Id,
|
||||
App = a.AppKey,
|
||||
Code = a.Code,
|
||||
EnTrackStatus = a.EnStatus,
|
||||
TrackStatus = a.Status,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user