From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java b/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java
index 39adb3b..657cfc2 100644
--- a/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java
+++ b/bankapi/src/main/java/com/taxi591/bankapi/service/BankService.java
@@ -97,6 +97,7 @@
             result.setResult(chargeBillRequest);
             result.setBack(createResponse(chargeBillRequest,dealBack));
         }catch (ServiceException e){
+            result.setBack(e.getMessage());
             throw e;
         }catch (Exception e){
             log.error("解析异常:{}",requestContent,e);

--
Gitblit v1.7.1