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/IOperationSysServer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs b/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs
index 2386291..93aeebd 100644
--- a/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs
+++ b/Wms/WMS.IBLL/ILogServer/IOperationSysServer.cs
@@ -49,7 +49,7 @@
/// <param name="menuno">鑿滃崟鍙�</param>
/// <param name="parentno">妯″潡鍙�</param>
/// <returns></returns>
- Task<SqlSugarPagedList<OperationDto>> GetSysOperationList(GetOperationVm model);
+ Task<SqlSugarPagedList> GetSysOperationList(GetOperationVm model);
/// <summary>
/// 鏂板绯荤粺鎿嶄綔鏃ュ織
--
Gitblit v1.8.0