diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java
index df3feab..c2fb331 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenDeviceInfoController.java
@@ -56,7 +56,7 @@ public class KitchenDeviceInfoController extends BaseController {
     @GetMapping("/select")
     public AjaxResult select(KitchenDeviceListDTO kitchenDeviceInfo) {
         try{
-            List<KitchenDeviceInfo> list = kitchenDeviceInfoService.selectKitchenDeviceInfoSelect(kitchenDeviceInfo);
+            List<KitchenDeviceListVO> list = kitchenDeviceInfoService.selectKitchenDeviceInfoSelect(kitchenDeviceInfo);
             return success(list);
         }catch (Exception e) {
             return error(e.getMessage());
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java
index 0ba4bd7..302585c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceInfo.java
@@ -74,7 +74,10 @@ public class KitchenDeviceInfo extends Model<KitchenDeviceInfo> {
     /** 所在位置 */
     @Excel(name = "所在位置")
     @ApiModelProperty(value = "所在位置")
-    private String subPlace;
+    private Integer subPlace;
+
+    @ApiModelProperty(value = "所在位置名称")
+    private String subPlaceName;
 
     /** 设备是否在线 1 在线 2 离线 */
     @Excel(name = "设备是否在线 1 在线 2 离线")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java
index 925b710..9a23195 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/dto/IndexHomePageDTO.java
@@ -2,6 +2,7 @@ package com.bonus.canteen.core.kitchen.dto;
 
 import lombok.Data;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -14,12 +15,16 @@ import java.time.LocalDateTime;
 @ToString
 public class IndexHomePageDTO {
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate deviceStartTime; // 当前时间
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate deviceEndTime; // 厨房名称
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate sampleStartTime; // 留样机开始时间
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate sampleEndTime; // 留样机结束时间
 
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java
index 0324d42..4e2bf7d 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/IKitchenDeviceInfoService.java
@@ -63,7 +63,7 @@ public interface IKitchenDeviceInfoService extends IService<KitchenDeviceInfo> {
      */
     public int deleteKitchenDeviceInfoByDeviceId(Long deviceId);
 
-    List<KitchenDeviceInfo> selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo);
+    List<KitchenDeviceListVO> selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo);
 
     Map<Integer, String> deviceType();
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java
index 780cebf..3dfef94 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceInfoServiceImpl.java
@@ -203,15 +203,16 @@ public class KitchenDeviceInfoServiceImpl extends ServiceImpl<KitchenDeviceInfoM
 
 
     @Override
-    public List<KitchenDeviceInfo> selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo) {
-        return kitchenDeviceInfoMapper.selectList(
-                Wrappers.<KitchenDeviceInfo>lambdaQuery()
-                        .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceName()), KitchenDeviceInfo::getDeviceName, kitchenDeviceInfo.getDeviceName())
-                        .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceNo()), KitchenDeviceInfo::getDeviceNo, kitchenDeviceInfo.getDeviceNo())
-                        .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceSn()), KitchenDeviceInfo::getDeviceSn, kitchenDeviceInfo.getDeviceSn())
-                        .eq(kitchenDeviceInfo.getDeviceType() != 0, KitchenDeviceInfo::getDeviceType, kitchenDeviceInfo.getDeviceType())
-                        .eq(KitchenDeviceInfo::getDelFlag, DelFlagEnum.DEL_FALSE.key()) // 仅查询未删除的设备
-        );
+    public List<KitchenDeviceListVO> selectKitchenDeviceInfoSelect(KitchenDeviceListDTO kitchenDeviceInfo) {
+//        return kitchenDeviceInfoMapper.selectList(
+//                Wrappers.<KitchenDeviceInfo>lambdaQuery()
+//                        .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceName()), KitchenDeviceInfo::getDeviceName, kitchenDeviceInfo.getDeviceName())
+//                        .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceNo()), KitchenDeviceInfo::getDeviceNo, kitchenDeviceInfo.getDeviceNo())
+//                        .like(StringUtils.isNotEmpty(kitchenDeviceInfo.getDeviceSn()), KitchenDeviceInfo::getDeviceSn, kitchenDeviceInfo.getDeviceSn())
+//                        .eq(kitchenDeviceInfo.getDeviceType() != 0, KitchenDeviceInfo::getDeviceType, kitchenDeviceInfo.getDeviceType())
+//                        .eq(KitchenDeviceInfo::getDelFlag, DelFlagEnum.DEL_FALSE.key()) // 仅查询未删除的设备
+//        );
+        return kitchenDeviceInfoMapper.selectKitchenDeviceInfoList(kitchenDeviceInfo);
     }
 
     @Override
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java
index 8cbce22..bf167f9 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenHomePageerviceImpl.java
@@ -241,7 +241,6 @@ public class KitchenHomePageerviceImpl implements IKitchenHomePageService {
         }
 
         indexHomePageInformationVO.setDeviceCount(Integer.valueOf(deviceInfoCount.toString()));
-
         indexHomePageInformationVO.setEmployeeViolation(employeeViolation);
         indexHomePageInformationVO.setEnvironmentalAlarm(environmentaAlarm);
         indexHomePageInformationVO.setHistoricalWarningCount(historicalWarningCount);
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java
index 6c21933..77c8a02 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/vo/KitchenDeviceListVO.java
@@ -65,6 +65,9 @@ public class KitchenDeviceListVO {
     @ApiModelProperty(value = "所在位置")
     private String subPlace;
 
+    @ApiModelProperty(value = "所在位置名称")
+    private String subPlaceName;
+
     /** 设备是否在线 1 在线 2 离线 */
     @ApiModelProperty(value = "设备是否在线 1 在线 2 离线")
     private Integer deviceNetworkState;