From 4010eccfd7a6e0f79041f9cb051c7f9d09bfdedc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
index d342ddf..030e58b 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AppFranchiseeController.java
@@ -187,7 +187,7 @@
         franchiseeWithdraw.setHandle(byId.getNickName());
         franchiseeWithdraw.setUpdateTime(new Date());
         franchiseeWithdrawService.updateById(franchiseeWithdraw);
-        Franchisee franchisee = franchiseeService.getById(byId.getFranchiseeId());
+        Franchisee franchisee = franchiseeService.getById(franchiseeWithdraw.getFranchiseeId());
         if (auditFranchiseeWithdrawDTO.getStatus()==3){
             // 回退运营商余额
             TFranchiseeBalanceChange balanceChange = new TFranchiseeBalanceChange();

--
Gitblit v1.7.1