From c87eed4ce82f1a4b848e5767a60921051bd903d3 Mon Sep 17 00:00:00 2001
From: lihongbiao <964708803@qq.com>
Date: Sat, 23 Aug 2025 14:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AF=E5=8C=BA=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/EmScenicController.java       | 6 ------
 .../modules/system/service/impl/EmScenicServiceImpl.java    | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java
index c87562b..4d23c08 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/controller/EmScenicController.java
@@ -2,20 +2,16 @@ package com.aircraft.modules.system.controller;
 
 
 import com.aircraft.annotation.Log;
-import com.aircraft.modules.system.domain.EmEmployees;
 import com.aircraft.modules.system.domain.EmScenic;
 import com.aircraft.modules.system.domain.User;
-import com.aircraft.modules.system.service.EmEmployeesService;
 import com.aircraft.modules.system.service.EmScenicService;
 import com.aircraft.modules.system.service.UserService;
 import com.aircraft.utils.PageResult;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import kotlin.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmScenicServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmScenicServiceImpl.java
index 0331bdf..d3083e2 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmScenicServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/system/service/impl/EmScenicServiceImpl.java
@@ -57,7 +57,7 @@ public class EmScenicServiceImpl extends ServiceImpl<EmScenicMapper, EmScenic> i
                 record.setAreaName(areaService.findById(record.getAreaId()).getName());
             }
         }
-        return PageUtil.toPage(emScenicIPage.getRecords());
+        return PageUtil.toPage(emScenicIPage);
     }
 
     @Override