From ca75cf818e434f77ca71d78ac2c883ca41b18713 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期五, 22 十一月 2024 11:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/herb' into herb
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryFaultRecord.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryFaultRecord.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryFaultRecord.java
index a4ab146..ad09d31 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryFaultRecord.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryFaultRecord.java
@@ -40,6 +40,9 @@
@Excel(name = "宸ュ崟id", width = 15)
@ApiModelProperty(value = "宸ュ崟id")
private String orderId;
+ @Excel(name = "绉熸埛id", width = 15)
+ @ApiModelProperty(value = "绉熸埛id")
+ private Integer tenantId;
/**鏁呴殰鍚嶇О*/
@Excel(name = "鏁呴殰鍚嶇О", width = 15)
@ApiModelProperty(value = "鏁呴殰鍚嶇О")
@@ -92,8 +95,9 @@
public DryFaultRecord() {
}
- public DryFaultRecord(String orderId, String faultName,Integer faultType, Date startTime, Date endTime) {
+ public DryFaultRecord(String orderId,Integer tenantId, String faultName,Integer faultType, Date startTime, Date endTime) {
this.orderId = orderId;
+ this.tenantId = tenantId;
this.faultName = faultName;
this.startTime = startTime;
this.endTime = endTime;
--
Gitblit v1.9.3