diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java index 9976584f..8d45cdd3 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcDevice.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcDevice.java @@ -29,9 +29,11 @@ public class DcDevice { public static final String OFFLINE = "0"; // 在线状态 public static final String ONLINE = "1"; - + @ApiModelProperty("设备名称") + @Excel(name = "设备名称") + private String deviceName; @ApiModelProperty("ID") - @Excel(name = "设备ID") + //@Excel(name = "设备ID") @TableId(value = "id", type = IdType.AUTO) private Long id; @ApiModelProperty("物联设备ID") @@ -41,7 +43,7 @@ public class DcDevice { //@Excel(name = "所属机构") private Long groupId; @ApiModelProperty("产品ID") - @Excel(name = "产品ID") + //@Excel(name = "产品ID") private Long productId; @ApiModelProperty("桩号") @Excel(name = "桩号") @@ -49,9 +51,6 @@ public class DcDevice { @ApiModelProperty("方向1-上行(菏泽方向),2-中,3-下行(济南方向)") @Excel(name = "方向", readConverterExp = "1=菏泽方向,3=济南方向") private String direction; - @ApiModelProperty("设备名称") - @Excel(name = "设备名称") - private String deviceName; @ApiModelProperty("设备编号") @Excel(name = "设备编号") private String deviceCode;