From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
index bb71b79..a3d1c64 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java
@@ -15,21 +15,6 @@
{
private static final long serialVersionUID = 1L;
- /** id */
- private String id;
-
- /** 鎺掑簭 */
- @Excel(name = "鎺掑簭")
- private String orderNumber;
-
- /** 褰曞埗鏃堕棿 */
- @Excel(name = "褰曞埗鏃堕棿")
- private String recordingTime;
-
- /** 浜昳d */
- @Excel(name = "浜昳d")
- private String wellId;
-
/** 浠诲姟id */
@Excel(name = "浠诲姟id")
private String taskId;
@@ -42,42 +27,21 @@
@Excel(name = "鐢ㄦ埛id")
private String userId;
- public void setId(String id)
- {
- this.id = id;
- }
+ /** id */
+ private String id;
- public String getId()
- {
- return id;
- }
- public void setOrderNumber(String orderNumber)
- {
- this.orderNumber = orderNumber;
- }
+ /** 鎺掑簭 */
+ @Excel(name = "鎺掑簭")
+ private Integer orderNumber;
- public String getOrderNumber()
- {
- return orderNumber;
- }
- public void setRecordingTime(String recordingTime)
- {
- this.recordingTime = recordingTime;
- }
+ /** 褰曞埗鏃堕棿 */
+ @Excel(name = "褰曞埗鏃堕棿")
+ private Integer recordingTime;
- public String getRecordingTime()
- {
- return recordingTime;
- }
- public void setWellId(String wellId)
- {
- this.wellId = wellId;
- }
+ /** 浜昳d */
+ @Excel(name = "浜昳d")
+ private String wellId;
- public String getWellId()
- {
- return wellId;
- }
public void setTaskId(String taskId)
{
this.taskId = taskId;
@@ -105,17 +69,53 @@
{
return userId;
}
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setOrderNumber(Integer orderNumber)
+ {
+ this.orderNumber = orderNumber;
+ }
+
+ public Integer getOrderNumber()
+ {
+ return orderNumber;
+ }
+ public void setRecordingTime(Integer recordingTime)
+ {
+ this.recordingTime = recordingTime;
+ }
+
+ public Integer getRecordingTime()
+ {
+ return recordingTime;
+ }
+ public void setWellId(String wellId)
+ {
+ this.wellId = wellId;
+ }
+
+ public String getWellId()
+ {
+ return wellId;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("taskId", getTaskId())
+ .append("deptId", getDeptId())
+ .append("userId", getUserId())
.append("id", getId())
.append("orderNumber", getOrderNumber())
.append("recordingTime", getRecordingTime())
.append("wellId", getWellId())
- .append("taskId", getTaskId())
- .append("deptId", getDeptId())
- .append("userId", getUserId())
.toString();
}
}
--
Gitblit v1.9.3