Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -70,12 +70,10 @@ public class AndonConfig extends BaseBean implements Serializable {
     @ApiParam(value ="参数值描述")
     private String configValueDesc;
 
-    //******以下不用了*******
     @Column(name="CONFIG_TYPE")
     @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1")
     private Integer configType;
 
-    // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
     @Column(name="CONFIG_GROUP")
     @ApiParam(value ="参数组")
     private Integer configGroup;

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

@@ -12,8 +12,8 @@ import java.io.Serializable;
  * @desc
  */
 @Data
-@ApiModel("安灯事件界面配置MODEL")
-public class AndonStatusInterfaceCfgModel implements Serializable {
+@ApiModel("安灯枚举配置MODEL")
+public class AndonCommEnumModel implements Serializable {
 
     private static final long serialVersionUID = -4504617079257753276L;
 

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

@@ -50,6 +50,12 @@ public class AndonConfigModel implements Serializable {
     @ApiParam(value ="参数值描述")
     private String configValueDesc;
 
+    @ApiParam(value ="参数类型")
+    private Integer configType;
+
+    @ApiParam(value ="参数组")
+    private Integer configGroup;
+
     @ApiParam("组织代码")
     private String organizeCode;
 

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

@@ -59,10 +59,10 @@ public abstract class StationRequestBeanAb implements Serializable {
     @ApiParam(value = "安灯队列编号")
     public String andonOrderNo;
 
-    @ApiParam(value = "安灯事件")
+    @ApiParam(value = "安灯状态")
     public String alarmStatus;
 
-    @ApiParam(value = "安灯事件名称(呼叫 响应 解决 撤销 等)")
+    @ApiParam(value = "安灯状态名称(呼叫 响应 解决 撤销 等)")
     public String alarmStatusName;
 
     @ApiParam("消息数据")