diff --git a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java index d7c047d..5f4dee2 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java +++ b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java @@ -68,9 +68,6 @@ public class BaseBusbarInfo extends BaseEntity @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date updatedTime; - /** 电柜别名 */ - @Excel(name = "电柜别名") - private String cabinetAlias; public void setObjId(Long objId) { @@ -181,13 +178,7 @@ public class BaseBusbarInfo extends BaseEntity return updatedTime; } - public String getCabinetAlias() { - return cabinetAlias; - } - public void setCabinetAlias(String cabinetAlias) { - this.cabinetAlias = cabinetAlias; - } @Override public String toString() { @@ -205,7 +196,6 @@ public class BaseBusbarInfo extends BaseEntity .append("createdTime", getCreatedTime()) .append("updatedBy", getUpdatedBy()) .append("updatedTime", getUpdatedTime()) - .append("cabinetAlias", getCabinetAlias()) .toString(); } } diff --git a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseCabinetInfo.java b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseCabinetInfo.java index a92d867..4cc348c 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseCabinetInfo.java +++ b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseCabinetInfo.java @@ -56,17 +56,6 @@ public class BaseCabinetInfo extends BaseEntity @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date updatedTime; - /** 母排别名 */ - @Excel(name = "母排别名") - private String busbarAlias; - - /** 母排距离 */ - @Excel(name = "母排距离") - private BigDecimal busbarDist; - - /** 母排编号 */ - @Excel(name = "母排编号") - private Long busbarCode; @@ -152,29 +141,6 @@ public class BaseCabinetInfo extends BaseEntity return updatedTime; } - public String getBusbarAlias() { - return busbarAlias; - } - - public void setBusbarAlias(String busbarAlias) { - this.busbarAlias = busbarAlias; - } - - public BigDecimal getBusbarDist() { - return busbarDist; - } - - public void setBusbarDist(BigDecimal busbarDist) { - this.busbarDist = busbarDist; - } - - public Long getBusbarCode() { - return busbarCode; - } - - public void setBusbarCode(Long busbarCode) { - this.busbarCode = busbarCode; - } @Override public String toString() { @@ -189,9 +155,6 @@ public class BaseCabinetInfo extends BaseEntity .append("createdTime", getCreatedTime()) .append("updatedBy", getUpdatedBy()) .append("updatedTime", getUpdatedTime()) - .append("busbarAlias", getBusbarAlias()) - .append("busbarDist", getBusbarDist()) - .append("busbarCode", getBusbarCode()) .toString(); } }