From 72aaf45389cd09c206ee1b90f0c7f5bf59782930 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
index 12b7122..a8c865b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
@@ -225,7 +225,7 @@
             return R.fail("该订单已发货");
         }
         exchange1.setStatus(2);
-        exchange1.setLogisticsNumber(exchange1.getLogisticsNumber());
+        exchange1.setLogisticsNumber(exchange.getLogisticsNumber());
         sysGoodsExchangeService.updateById(exchange1);
         return R.ok();
     }

--
Gitblit v1.7.1