Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

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

@@ -51,10 +51,12 @@ public class AndonCellAlarmCause extends BaseBean  implements Serializable {
     @ApiParam(value = "事件描述")
     private String acCode;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "安灯类型名称")
     private String alarmCodeName;
 
+    @AnnoOutputColumn(hidden = true)
     @Transient
     @ApiParam(value = "呼叫原因描述")
     private String acName;

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

@@ -45,4 +45,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
     private boolean errorInnerAction = false;
 
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -51,4 +51,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
     private boolean errorInnerAction = false;
 
+    @ApiModelProperty("默认异常入库")
+    private boolean errorInsertFlag = true;
+
 }