Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="ANDON_BRODCAST")
+@Table(name="ANDON_BROADCAST")
 @Api("安灯广播")
 public class AndonBroadCast extends BaseBean {
     @Column(name="DEVICE_NUM")
@@ -71,6 +71,4 @@ public class AndonBroadCast extends BaseBean {
     @Column(name="PLAY_TIME")
     @ApiParam("播放循环次数")
     private Integer playTime = 1;
-
-
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java

@@ -28,7 +28,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="ANDON_BRODCAST_CFG")
+@Table(name="ANDON_BROADCAST_CFG")
 @Api("生产区域")
 public class AndonBroadCastCfg extends BaseBean {
     @Column(name="ALARM_CODE")

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -702,7 +702,8 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum NOTICE_MESSAGE_SEND_TYPE {
         SMS("10","短信"),
-        EMAIL("20","邮箱");
+        EMAIL("20","邮箱"),
+        BROAD_CAST("30","广播");
 
         private String value;
         private String description;