diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/BaseSettingController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/BaseSettingController.java
index c9a5770..e19b408 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/BaseSettingController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/BaseSettingController.java
@@ -9,6 +9,7 @@ import com.bonus.canteen.core.android.service.DeviceService;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.core.web.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,13 +63,10 @@ public class BaseSettingController extends BaseController {
 
     @ApiOperation("查询轮播图")
     @GetMapping("/getCarouselImage")
-    public AjaxResult getCarouselImage(CarouselImage carouselImage) {
-        if(carouselImage.getIsPaging() == 1){
+    public TableDataInfo getCarouselImage(CarouselImage carouselImage) {
+        if(carouselImage.getIsPaging() == 2){
             startPage();
         }
-        return success(baseSettingService.getCarouselImage(carouselImage));
+        return getDataTable(baseSettingService.getCarouselImage(carouselImage));
     }
-
-
-
 }