From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
old mode 100644
new mode 100755
index 7b318b9..1007d45
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
@@ -10,6 +10,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.ToString;
+import org.jeecg.modules.dry.vo.RealTimeDataVo;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -28,6 +30,7 @@
@TableName("dry_equipment")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
+@ToString
@ApiModel(value="dry_equipment瀵硅薄", description="骞茬嚗鏈�")
public class DryEquipment implements Serializable {
private static final long serialVersionUID = 1L;
@@ -82,4 +85,16 @@
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private Integer tenantId;
+
+ /**璁惧IP*/
+ @Excel(name = "璁惧IP", width = 15)
+ @ApiModelProperty(value = "璁惧IP")
+ private String ip;
+
+ public DryEquipment() {
+ }
+ public DryEquipment(RealTimeDataVo realTimeDataVo) {
+ this.code = realTimeDataVo.getMachineid();
+ this.tenantId = realTimeDataVo.getTenantid();
+ }
}
--
Gitblit v1.9.3