zhaiyifei 10 месяцев назад
Родитель
Сommit
4abaf9ffa8

+ 3 - 2
src/main/java/com/yunfeiyun/agmp/iot/common/domain/TmnBlock.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 /**
@@ -11,7 +10,7 @@ import lombok.Data;
  * @date 2023-07-12
  */
 @Data
-public class TmnBlock extends BaseEntity
+public class TmnBlock extends IotBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -33,4 +32,6 @@ public class TmnBlock extends BaseEntity
     /** 设备地块分配时间 */
     @Excel(name = "设备地块分配时间")
     private String tmnblockAssigndate;
+
+    private String tid;
 }

+ 4 - 50
src/main/java/com/yunfeiyun/agmp/iot/common/domain/TmnLand.java

@@ -1,9 +1,7 @@
 package com.yunfeiyun.agmp.iot.common.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
 
 /**
  * 设备基地对象 TmnLand
@@ -11,7 +9,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author 杨晓辉
  * @date 2023-07-12
  */
-public class TmnLand extends BaseEntity
+@Data
+public class TmnLand extends IotBaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -30,50 +29,5 @@ public class TmnLand extends BaseEntity
     @Excel(name = "设备基地分配时间")
     private String tmnlandAssigndate;
 
-    public void setTmnlandId(String tmnlandId)
-    {
-        this.tmnlandId = tmnlandId;
-    }
-
-    public String getTmnlandId()
-    {
-        return tmnlandId;
-    }
-    public void setTmnId(String tmnId)
-    {
-        this.tmnId = tmnId;
-    }
-
-    public String getTmnId()
-    {
-        return tmnId;
-    }
-    public void setLandId(String landId)
-    {
-        this.landId = landId;
-    }
-
-    public String getLandId()
-    {
-        return landId;
-    }
-    public void setTmnlandAssigndate(String tmnlandAssigndate)
-    {
-        this.tmnlandAssigndate = tmnlandAssigndate;
-    }
-
-    public String getTmnlandAssigndate()
-    {
-        return tmnlandAssigndate;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("tmnlandId", getTmnlandId())
-            .append("tmnId", getTmnId())
-            .append("landId", getLandId())
-            .append("tmnlandAssigndate", getTmnlandAssigndate())
-            .toString();
-    }
+    private String tid;
 }