From 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:13:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwCustomerRechargeCloudController.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwCustomerRechargeCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwCustomerRechargeCloudController.java
index da8fe3d..8d2aec4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwCustomerRechargeCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwCustomerRechargeCloudController.java
@@ -34,6 +34,9 @@
     public ApiResponse<PageData<YwCustomerRechargeMerchantVO>> merchantPage(
             @RequestBody PageWrap<YwCustomerRechargeQueryDTO> pageWrap,
             @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        if (pageWrap == null) {
+            pageWrap = new PageWrap<>();
+        }
         return ApiResponse.success(ywCustomerRechargeBizService.findMerchantPage(pageWrap));
     }
 

--
Gitblit v1.9.3