Merge pull request 'test' (#346) from jhforever.wang/i3plus-pojo-U7:test into test

Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/346

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

@@ -85,4 +85,8 @@ public class AndonManageRouteErrorRecord extends BaseBean implements Serializabl
     @ApiParam(value = "处理状态")
     private Integer handleStatus;
 
+    @Column(name = "ALARM_ERROR_TIME")
+    @ApiParam("安灯异常时间")
+    public String alarmErrorTime;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonStatusInterfaceCfgModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+@Data
+@ApiModel("安灯事件界面配置MODEL")
+public class AndonStatusInterfaceCfgModel implements Serializable {
+
+    private static final long serialVersionUID = -4504617079257753276L;
+
+    @ApiParam("界面代码")
+    private String value;
+
+    @ApiParam("界面名称")
+    private String description;
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBean.java

@@ -17,9 +17,6 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ
 
     private static final long serialVersionUID = -3122891627710528829L;
 
-    @ApiParam("组织代码")
-    private String organizeCodeExt = "test";
-
     @Override
     public String toString() {
         return "StationRequestBean{" +
@@ -40,7 +37,7 @@ public class StationRequestBean extends StationRequestBeanAb implements Serializ
                 ", fsmList=" + get(fsmList) +
                 ", curFsm=" + get(curFsm) +
                 ", triggerEvent='" + get(triggerEvent) + '\'' +
-                ", organizeCodeExt='" + get(organizeCodeExt) + '\'' +
+                ", alarmErrorTime='" + get(alarmErrorTime) + '\'' +
                 '}';
     }
 

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/StationRequestBeanAb.java

@@ -77,6 +77,9 @@ public abstract class StationRequestBeanAb implements Serializable {
     @ApiParam("当前触发事件")
     public String triggerEvent;
 
+    @ApiParam("安灯异常时间")
+    public String alarmErrorTime;
+
     public String get(Object obj)  {
         if (null == obj) {
             return "";