From 6ce721899ae102e53def5e92ea39d0815417c98a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 1 Aug 2023 11:10:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AB=AF=E4=BC=9A=E8=AE=AE=E4=B8=8B=E8=BD=BD=E8=B5=84?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/meeting/controller/PayMeetingController.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 58fcfb5f..3700a76e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -25,7 +25,6 @@ import com.jero.data.service.IPayCaseCommitteeService;
 import com.jero.data.service.IPayCaseCommitteeSubitemService;
 import com.jero.data.service.IPayCaseCouncilSubitemService;
 import com.jero.meeting.common.MeetingCommon;
-import com.jero.meeting.common.MeetingSubitemCommon;
 import com.jero.meeting.entity.*;
 import com.jero.meeting.mapper.PayMeetingGuestsFileMapper;
 import com.jero.meeting.service.*;
@@ -671,10 +670,11 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
      * 预览图片&下载文件
      *
      * @param id       传入文件id
+     * @return
      */
     @ApiOperation(value = "小程序企业端会议下载资料", notes = "企业端会议下载资料")
     @GetMapping(value = "/userDownloadByApplet/{id}/{meetingId}")
-    public void userDownloadByApplet(@PathVariable String id, @PathVariable String meetingId, HttpServletResponse response, String type) {
+    public Result<Object> userDownloadByApplet(@PathVariable String id, @PathVariable String meetingId, HttpServletResponse response, String type) {
         LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
         String sysUserId = sysUser.getId();
         PayMeeting payMeeting = payMeetingService.getById(meetingId);
@@ -733,7 +733,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                     }
                 }
         }
-
+        return Result.OK();
 
     }
 }