From 212062096cf85f7421de7b8598f3c960a8c331a7 Mon Sep 17 00:00:00 2001
From: zhangke <sunwill6677@>
Date: Tue, 3 Mar 2026 11:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/com/nflg/wms/admin/DeployTest.java          | 4 ++--
 .../src/main/resources/mapper/WmsReturnRequestMapper.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java
index 9309c923..00f54ae8 100644
--- a/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java
+++ b/nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java
@@ -33,9 +33,9 @@ public class DeployTest {
         //处理主jar包
         handleFile(sshUtil, localPath + jarName, remotePath + jarName);
         //处理字体目录
-//        handleDir(sshUtil, localPath, remotePath, "fonts");
+    handleDir(sshUtil, localPath, remotePath, "fonts");
         //处理lib目录
-//        handleDir(sshUtil, localPath, remotePath, "lib");
+        handleDir(sshUtil, localPath, remotePath, "lib");
         //执行脚本启动服务
         sshUtil.exec("cd " + remotePath + " && ./restart.sh");
         sshUtil.disconnect();
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
index 41d4d506..d4a1e86b 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
@@ -33,7 +33,7 @@
                 and a.note_num =#{ request.deliveryNo}
             </if>
             <if test="request.supplierCode !=null and request.supplierCode !=''">
-                and a.supplier_code =#{ request.supplierCode}
+                and a.supplier_num =#{ request.supplierCode}
             </if>
         </where>
         group by