Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -301,6 +301,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable {
     @ApiParam(value ="故障字符串")
     private String faultStr;
 
+    @Transient
+    @ApiParam(value ="百分比")
+    private Integer propagation;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -87,6 +87,8 @@ public class MgnBjBoardModel implements Serializable {
 
     private Map<String, Object> resultMap;
 
+    private Object obj;
+
     @ApiParam("显示数据")
     private List<MgnBjBoardSeriesModel> seriesModels;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -58,4 +58,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
 
     @ApiParam("关联单据行号")
     public String refItem;
+
+    @ApiParam("打印状态")
+    public Integer isPrinted;
 }