diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java
index b537cd8..0982988 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java
@@ -13,7 +13,9 @@ import com.bonus.material.device.domain.DevInfo;
 import com.bonus.material.device.domain.dto.DevInfoImpDto;
 import com.bonus.material.device.domain.dto.InfoMotionDto;
 import com.bonus.material.device.domain.vo.DevInfoVo;
+import com.bonus.material.device.domain.vo.DevTemplateVo;
 import com.bonus.material.device.service.DevInfoService;
+import com.bonus.system.api.domain.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -249,8 +251,8 @@ public class DevInfoController extends BaseController {
      */
     @ApiOperation(value = "设备批量导入模版下载")
     @PostMapping("/downLoadDev")
-    public void downLoadDev(){
-        HttpServletResponse resp = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getResponse();
+    public void downLoadDev() {
+        HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
         devInfoService.downLoadDev(resp);
     }
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
index c6a9d16..e9f6323 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
@@ -979,23 +979,19 @@ public class DevInfoServiceImpl implements DevInfoService {
                 Map<String, List<DevTemplateVo>> map = maDevList.stream().collect(Collectors.groupingBy(DevTemplateVo::getDeviceName));
                 for (Map.Entry<String, List<DevTemplateVo>> entry : map.entrySet()) {
                     // 如果map的数量大于1，则进行遍历
-                    if (entry.getValue().size() > 1) {
-                        DevTemplateVo devTemplateVo = entry.getValue().get(0);
-                        DevTemplateVo dto = new DevTemplateVo();
-                        List<DevTemplateVo> devTemplateVos = entry.getValue();
-                        for (DevTemplateVo templateVo : devTemplateVos) {
-                            dto.setIdentifyCode(StringUtils.isNotBlank(templateVo.getIdentifyCode()) ? templateVo.getIdentifyCode() : null);
-                            dto.setCheckMan(StringUtils.isNotBlank(templateVo.getCheckMan()) ? templateVo.getCheckMan() : null);
-                            dto.setCheckDate(StringUtils.isNotBlank(templateVo.getCheckDate()) ? templateVo.getCheckDate() : null);
-                            dto.setNextCheckDate(StringUtils.isNotBlank(templateVo.getNextCheckDate()) ? templateVo.getNextCheckDate() : null);
-                            dtoList.add(dto);
-                        }
-                        devTemplateVo.setDtoList(dtoList);
-                        templateVos.add(devTemplateVo);
-                    } else {
-                        DevTemplateVo devTemplateVo = entry.getValue().get(0);
-                        templateVos.add(devTemplateVo);
+                    DevTemplateVo devTemplateVo = entry.getValue().get(0);
+                    DevTemplateVo dto = new DevTemplateVo();
+                    List<DevTemplateVo> devTemplateVos = entry.getValue();
+                    for (DevTemplateVo templateVo : devTemplateVos) {
+                        dto.setIdentifyCode(StringUtils.isNotBlank(templateVo.getIdentifyCode()) ? templateVo.getIdentifyCode() : null);
+                        dto.setCheckMan(StringUtils.isNotBlank(templateVo.getCheckMan()) ? templateVo.getCheckMan() : null);
+                        dto.setCheckDate(StringUtils.isNotBlank(templateVo.getCheckDate()) ? templateVo.getCheckDate() : null);
+                        dto.setNextCheckDate(StringUtils.isNotBlank(templateVo.getNextCheckDate()) ? templateVo.getNextCheckDate() : null);
+                        dtoList.add(dto);
                     }
+                    devTemplateVo.setDtoList(dtoList);
+                    templateVos.add(devTemplateVo);
+
                 }
             }
             return AjaxResult.success(templateVos);
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx b/bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx
index ff3cd35..13b12e6 100644
Binary files a/bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx and b/bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx differ