Merge branch 'dev' into test

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{
@@ -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;
+        }
+    }
 }