diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java index 46647fcb..23e3d0ee 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquEquipment.java @@ -104,13 +104,13 @@ public class EquEquipment extends BaseEntity { * 预留字段3 */ @Excel(name = "预留字段3") - private Long attr3; + private String attr3; /** * 预留字段4 */ @Excel(name = "预留字段4") - private Long attr4; + private String attr4; /** * 工段 @@ -394,19 +394,19 @@ public class EquEquipment extends BaseEntity { return attr2; } - public void setAttr3(Long attr3) { + public void setAttr3(String attr3) { this.attr3 = attr3; } - public Long getAttr3() { + public String getAttr3() { return attr3; } - public void setAttr4(Long attr4) { + public void setAttr4(String attr4) { this.attr4 = attr4; } - public Long getAttr4() { + public String getAttr4() { return attr4; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java index ac49f6b1..c69693a8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/Equipment.java @@ -96,13 +96,13 @@ public class Equipment extends BaseEntity { * 预留字段3 */ @Excel(name = "预留字段3") - private Long attr3; + private String attr3; /** * 预留字段4 */ @Excel(name = "预留字段4") - private Long attr4; + private String attr4; /** * 工段 @@ -347,19 +347,19 @@ public class Equipment extends BaseEntity { return attr2; } - public void setAttr3(Long attr3) { + public void setAttr3(String attr3) { this.attr3 = attr3; } - public Long getAttr3() { + public String getAttr3() { return attr3; } - public void setAttr4(Long attr4) { + public void setAttr4(String attr4) { this.attr4 = attr4; } - public Long getAttr4() { + public String getAttr4() { return attr4; }