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/ISysServer/IInterfaceServer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs b/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs
index f9ab087..cb50cac 100644
--- a/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IInterfaceServer.cs
@@ -17,7 +17,7 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model);
+ Task<SqlSugarPagedList> GetInterfaceList(InterfaceVm model);
/// <summary>
/// 鑾峰彇鎺ュ彛鏄庣粏鍒楄〃
@@ -25,7 +25,7 @@
/// <param name="model"></param>
/// <param name="count"></param>
/// <returns></returns>
- Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model);
+ Task<SqlSugarPagedList> GetInterfaceDetailList(InterfaceDetailVm model);
/// <summary>
/// 娣诲姞鎺ュ彛淇℃伅
--
Gitblit v1.8.0