修改合并冲突
This commit is contained in:
1 parent
502342b15f
commit
12e16e0c6c
10 files changed
+11
-111
No files matched your search
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
@@ -6,11 +6,6 @@ using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Extensions;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
<<<<<<< HEAD
|
||||
using WalkingTec.Mvvm.Core;
|
||||
=======
|
||||
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
|
||||
|
||||
|
||||
namespace HHWMS.Web
|
||||
{
|
||||
@@ -54,7 +49,6 @@ namespace HHWMS.Web
|
||||
public override IOrderedQueryable<InterfaceLog_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<InterfaceLog>()
|
||||
<<<<<<< HEAD
|
||||
.CheckContain(Searcher.ModuleName, x=>x.ModuleName)
|
||||
.CheckContain(Searcher.ActionName, x=>x.ActionName)
|
||||
.CheckContain(Searcher.ITCode, x=>x.ITCode)
|
||||
@@ -67,20 +61,6 @@ namespace HHWMS.Web
|
||||
.Select(x => new InterfaceLog_View
|
||||
{
|
||||
ID = x.ID,
|
||||
=======
|
||||
.CheckContain(Searcher.ModuleName, x => x.ModuleName)
|
||||
.CheckContain(Searcher.ActionName, x => x.ActionName)
|
||||
.CheckContain(Searcher.ITCode, x => x.ITCode)
|
||||
.CheckContain(Searcher.ActionUrl, x => x.ActionUrl)
|
||||
.CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false)
|
||||
.CheckContain(Searcher.IP, x => x.IP)
|
||||
.CheckEqual(Searcher.LogType, x => x.LogType)
|
||||
.CheckContain(Searcher.Request, x => x.Request)
|
||||
.CheckContain(Searcher.Result, x => x.Result)
|
||||
.Select(x => new InterfaceLog_View
|
||||
{
|
||||
ID = x.ID,
|
||||
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
|
||||
ModuleName = x.ModuleName,
|
||||
ActionName = x.ActionName,
|
||||
ITCode = x.ITCode,
|
||||
@@ -100,12 +80,9 @@ namespace HHWMS.Web
|
||||
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
public class InterfaceLog_View : InterfaceLog{
|
||||
=======
|
||||
|
||||
public class InterfaceLog_View : InterfaceLog
|
||||
{
|
||||
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user