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/IPdaServer/IPdaAsnServer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index bbb4008..702e76c 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -58,7 +58,7 @@
///// </summary>
///// <param name="model"></param>
///// <param name="userId"></param>
- //void BindPalletPasteCode(PdaPalletBindVm model, int userId);
+ void BindPalletPasteCode(PdaPalletBindVm model, int userId);
/// <summary>
/// JC26缁戝畾鎵樼洏 涓嶈创鏍囩墿鏂�
--
Gitblit v1.8.0