Merge branch 'usky-zyj' into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -369,7 +369,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceInfo.setCreatedBy(SecurityUtils.getUsername());
             dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
             dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
-//            dmpDeviceInfo.setServiceStatus(1);
+            dmpDeviceInfo.setServiceStatus(1);
             if (StringUtils.isBlank(dmpDeviceInfo.getDeviceUuid())) {
                 dmpDeviceInfo.setDeviceUuid(UUIDUtils.uuid());
             }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/DeviceImportVo.java

@@ -1,7 +1,7 @@
 package com.usky.iot.service.vo;
 
 
-import com.usky.common.core.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -52,7 +52,7 @@ public class DeviceImportVo implements Serializable {
     /**
      * 设备所属类型（1、普通设备  2、网关设备  3、网关子设备）
      */
-    @Excel(name = "设备所属类型", readConverterExp = "1=普通设备,2=网关设备,3=网关子设备")
+    @Excel(name = "设备所属类型（必填）",replace = {"普通设备_1", "网关设备_2", "网关子设备_3"})
     private Integer categoryType;
 
     /**