#MOD 导出

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -202,27 +202,22 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class Vo {
 
-        @ExcelProperty("设备编号")
         @ApiModelProperty("设备id")
         private Long deviceId;
 
-        @ExcelProperty("设备名称")
         @ApiModelProperty("设备名称")
         private String deviceName;
 
-        @ExcelProperty(value = "设备类型", converter = DictConvert.class)
         @DictFormat(DictConsts.DEVICE_TYPE)
         @ApiModelProperty("设备类型")
         private Integer deviceType;
 
-        @ExcelProperty("商户设备资产编号")
         @ApiModelProperty("商户设备资产编号")
         private String mercDeviceCode;
 
         @ApiModelProperty("商户id")
         private Long mercId;
 
-        @ExcelProperty(value = "商户编码")
         @ApiModelProperty("商户编码")
         private String mercCode;
 
@@ -238,7 +233,6 @@ public class DeviceInfoDto {
         @ApiModelProperty("区域id")
         private Long districtId;
 
-        @ExcelProperty(value = "激活状态", converter = DictConvert.class)
         @DictFormat(DictConsts.DEVICE_ACTIVE_STATUS)
         @ApiModelProperty("激活状态")
         private Integer activeState;
@@ -247,7 +241,6 @@ public class DeviceInfoDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeTime;
 
-        @ExcelProperty(value = "运营状态", converter = DictConvert.class)
         @DictFormat(DictConsts.DEVICE_BUSY_STATUS)
         @ApiModelProperty("运营状态")
         private Integer busyState;
@@ -255,7 +248,6 @@ public class DeviceInfoDto {
         @ApiModelProperty("显示状态")
         private Boolean showStatus;
 
-        @ExcelProperty(value = "冻结状态", converter = DictConvert.class)
         @DictFormat(DictConsts.DEVICE_FREEZE_STATUS)
         @ApiModelProperty("冻结状态")
         private Integer freezeStatus;
@@ -269,7 +261,6 @@ public class DeviceInfoDto {
         @ApiModelProperty("纬度")
         private String lat;
 
-        @ExcelProperty(value = "故障等级", converter = DictConvert.class)
         @DictFormat(DictConsts.DEVICE_FAULT_LEVEL)
         @ApiModelProperty("故障等级")
         private Integer faultLevel;
@@ -297,21 +288,18 @@ public class DeviceInfoDto {
     @Accessors(chain = true)
     public static class Vo2 extends Vo {
 
-        @ExcelProperty("所属商户")
         @ApiModelProperty("商户名称")
         private String mercName;
 
         @ApiModelProperty("距离")
         private Integer m;
 
-        @ExcelProperty("点位")
         @ApiModelProperty("点位名称")
         private String placeName;
 
-        @ExcelProperty("线路")
         @ApiModelProperty("线路名称")
         private String placeLineName;
-        @ExcelProperty("区域")
+
         @ApiModelProperty("区域名称")
         private String districtName;
 
@@ -326,7 +314,7 @@ public class DeviceInfoDto {
         @ExcelProperty("所属商户")
         @ApiModelProperty("商户名称")
         private String mercName;
- 
+
 
         @ExcelProperty("点位")
         @ApiModelProperty("点位名称")
@@ -420,4 +408,4 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "商户ID")
         private Long mercId;
     }
-}
+}