From 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期四, 31 七月 2025 21:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
index f620637..a1dcca3 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
@@ -412,7 +412,7 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
     })
-    public ResultUtil uploadImg(MultipartFile multipartFile,HttpServletRequest request){
+    public ResultUtil uploadImg(MultipartFile file, HttpServletRequest request) {
         try {
 //            MediaResp mediaResp = MediaExample.uploadImage(multipartFile);
 //            String pictureName = OssUploadUtil.ossUpload(request, multipartFile);
@@ -420,7 +420,7 @@
 //            userService.insertImg(mediaId,pictureName);
 //            return ResultUtil.success(mediaId);
             return ResultUtil.success();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return ResultUtil.runErr();
         }

--
Gitblit v1.7.1