From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs b/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs
index 44e235a..ee046fa 100644
--- a/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs
+++ b/Wms/WMS.IBLL/ILogServer/IOperationCRServer.cs
@@ -1,7 +1,10 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.LogDto;
+using Model.ModelVm.LogVm;
+using SqlSugar;
namespace WMS.IBLL.ILogServer
{
@@ -19,8 +22,8 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime,
- string endTime, int page, int limit, out int count);
+ Task<List<OperationDto>> GetLogOperationCrList(string menuName, string type, string msg, string startTime,
+ string endTime, int page, int limit, RefAsync<int> count);
/// <summary>
/// 娣诲姞搴撳唴(鐩樺簱銆佺Щ搴�)鎿嶄綔鏃ュ織
/// </summary>
@@ -32,5 +35,10 @@
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
bool AddLogOperationCr(string parentNo, string menuName, string fkNo, string type, string msg, int userId);
+ /// <summary>
+ /// 鏂板绯荤粺鎿嶄綔鏃ュ織
+ /// </summary>
+ /// <returns></returns>
+ Task<int> AddLogOperationCr(OperationInputVm input);
}
}
--
Gitblit v1.8.0