Merge remote-tracking branch 'origin/master'

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java

@@ -139,6 +139,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
     @ApiOperation(value = "会议管理-添加", notes = "会议管理-添加")
     @PostMapping(value = "/add")
     public Result<?> add(@RequestBody PayMeetingVO payMeetingVO) {
+        payMeetingVO.setMeetingType(MeetingCommon.COMMITTEE_MEETING);
         ValidUtil.validate(payMeetingVO);
         payMeetingService.add(payMeetingVO);
         return Result.OK("添加成功！");
@@ -152,6 +153,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
     @ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑")
     @PostMapping(value = "/edit")
     public Result<?> edit(@RequestBody PayMeetingVO payMeetingVO) {
+        payMeetingVO.setMeetingType(MeetingCommon.COMMITTEE_MEETING);
         ValidUtil.validate(payMeetingVO, UpdateGroup.class);
         payMeetingService.editById(payMeetingVO);
         return Result.OK("编辑成功!");
@@ -227,6 +229,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
     @RequiresPermissions("committeeMeeting:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) {
+        payMeeting.setMeetingType(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING));
         QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
         List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
         List<Object> exportList = new ArrayList<>();