From a592f3dc14f342ceab26fb904cae1c4020244368 Mon Sep 17 00:00:00 2001
From: admin <1101184511@qq.com>
Date: 星期日, 09 二月 2025 19:35:36 +0800
Subject: [PATCH] Changes

---
 src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java b/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
index 8a6ca39..b6a6414 100644
--- a/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/admin/AdminOrderController.java
@@ -297,6 +297,7 @@
                 } else {
                     dto.setPayDevice("");
                 }
+                dto.setPayMerchant(order.getPayMerchant());
                 dataList.add(dto);
             }
 

--
Gitblit v1.8.0