From 326468e5ce8f9f69eb461f483cdd3a1c0575ad3c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/pojo/web_site/WorkflowMain.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
index 6abed7c..399d1be 100644
--- a/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
+++ b/src/main/java/com/whyc/pojo/web_site/WorkflowMain.java
@@ -54,11 +54,6 @@
@ApiModelProperty("褰掓。鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date endTime;
-
- @ApiModelProperty("鐢宠鏁伴噺")
- private Integer quantity;
- @ApiModelProperty("鏈鐞嗙殑鏁伴噺.缁翠慨鐢宠鏃堕渶濉叆")
- private Integer quantityUnprocessed;
/**浠诲姟绛夌骇*/
@ApiModelProperty("浠诲姟绛夌骇")
private Integer taskLevel;
@@ -104,15 +99,7 @@
@TableField(exist = false)
private List<WorkflowLink> linkList;
- public WorkflowMain(Integer id, Integer status, String endReason, Date endTime) {
- this.id = id;
- this.status = status;
- this.endReason = endReason;
- this.endTime = endTime;
- }
- public WorkflowMain() {
-
- }
-
+ @TableField(exist = false)
+ private List<WorkflowDevice> deviceList;
}
--
Gitblit v1.9.1