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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java

@@ -66,6 +66,11 @@ public class ProductRouting extends BaseAPS {
     @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
+    @Column(name="ROUTING_CHANGE")
+    @ApiParam(value ="工艺路径变更")
+    @FieldAnnotation(display = false)
+    private Boolean routingChange;
+
     @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EProductRouting.Material);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java

@@ -52,6 +52,5 @@ public class ResGanttTable extends BaseAPS {
     private transient ApsEnumUtil.EDIT_TYPE editType;
 
     @ApiParam(value ="枚举项内容")
-    @JsonIgnore
     private transient Enum<?>[] enumItems;
 }