fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

 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);