From 47baf16e0f4171602393de5315b18245fd64c512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= <hansen.ke@estsh.com>
Date: Fri, 31 May 2019 10:55:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ANDON=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 3e679f5..bd4493f 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -124,7 +124,7 @@ public class AndonEnumUtil {
 
     /**
      * 按灯动作标志
-     * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼
+     * 10 = 呼叫，20 = 签到，30 = 撤销，40 = 解决，50 = 转呼 ,60 = 提交，70 = 审批
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ANDON_ACTION_FLAG{

From 1adcd23c6faf59425f6c905658dd1aa4e3b436cc Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Fri, 31 May 2019 13:00:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E5=92=8C=E5=93=8D=E5=BA=94=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/AndonEnumUtil.java   | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index bd4493f..706378e 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -293,4 +293,31 @@ public class AndonEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 按灯通知方式
+     * 10-短信，20-邮箱
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_WAYS{
+
+        SMS("10","短信"),
+        EMAIL("20","邮箱");
+
+        private String value;
+        private String description;
+
+        NOTICE_WAYS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }