From 5eae801feb8b4ced2239001f905ca6f66cc42383 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 28 May 2021 17:43:41 +0800 Subject: [PATCH] =?UTF-8?q?16073=2019081-=E7=9C=8B=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BA=A7=E9=87=8F=E7=9C=8B=E6=9D=BF-=E4=BA=A7?= =?UTF-8?q?=E9=87=8F=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 0e4b269..ca1cdd2 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -301,6 +301,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="故障字符串") private String faultStr; + @Transient + @ApiParam(value ="百分比") + private Integer propagation; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 500b492..3e0f65b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -87,6 +87,8 @@ public class MgnBjBoardModel implements Serializable { private Map resultMap; + private Object obj; + @ApiParam("显示数据") private List seriesModels; }