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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index 06436ae..702e76c 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -51,13 +51,13 @@
void BindPalletByJc23(PdaPalletBindVm model, int userId, string origin);
//JC23缁戝畾鐗╂枡鎵樼洏鍗冲鍔犲簱瀛�
- public void BindPalletStock(PdaPalletBindVm model, int userId, string origin);
+ void BindPalletStock(PdaPalletBindVm model, int userId, string origin);
- /// <summary>
- /// JC26缁戝畾鎵樼洏 璐存爣鐗╂枡
- /// </summary>
- /// <param name="model"></param>
- /// <param name="userId"></param>
+ ///// <summary>
+ ///// JC26缁戝畾鎵樼洏 璐存爣鐗╂枡
+ ///// </summary>
+ ///// <param name="model"></param>
+ ///// <param name="userId"></param>
void BindPalletPasteCode(PdaPalletBindVm model, int userId);
/// <summary>
--
Gitblit v1.8.0