Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMeetingRoomScheduleController.java

@@ -79,7 +79,7 @@ public class BusMeetingRoomScheduleController {
 
 
     @ApiOperation(value="获取", notes="获取")
-    @PostMapping(value = "/fetch")
+    @GetMapping(value = "/fetch")
     public Result fetch(String startDate,String endDate,String hotelId){
         if(StringUtils.isBlank(startDate)){
             return Result.error(ResultCode.PARAM_MISS);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleServiceImpl.java

@@ -149,7 +149,7 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
                     Optional<BusMeetingRoomSchedule> scheduleOptional =  schedules.stream().filter(sc -> sc.getId().equals(vl.getMeetingRoomScheduleId())).findFirst();
                     if(!scheduleOptional.isPresent()) return;
                     BusMeetingRoomSchedule vl_schedule =  scheduleOptional.get();
-                    
+
                     //生成数据
                     scheduleDetailVo.setTheme(vl_schedule.getTheme());
                     scheduleDetailVo.setDetail(vl);