From 696695ef0e8de74c9d4aff103e4d3f79dd916e89 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Tue, 22 Sep 2020 17:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=2010923=2010894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java    | 20 ++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java  |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index c076230..8788520 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -5427,4 +5427,24 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 过程检测检测检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOARD_MONITOR_OBJECT_TYPE {
+        ORGANIZE("10"),
+        WORK_SHOP("20"),
+        WORK_CENTER("30");
+
+        private String value;
+
+        BOARD_MONITOR_OBJECT_TYPE(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java
index 7077a43..aa78191 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -45,4 +46,8 @@ public class MesBoardDisplay extends BaseBean implements Serializable {
     @Column(name = "ROLL_SPEED")
     @ApiParam("滚动速度")
     private Integer rollSpeed;
+
+    @Transient
+    @ApiParam("跑马灯字体颜色")
+    private String fontColor;
 }