Jenkins自动合并

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 import java.util.List;
 
@@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode {
     public List<WorkRelation> getPostRelations() {
         return BeanRelation.list(this, EBaseOrder.PostRelations);
     }
-
-    @JsonBackReference
-    public List<BaseOrder> getUpperOrders() {
-        return BeanRelation.list(this, EBaseOrder.UpperOrders);
-    }
-
-    @JsonBackReference
-    public List<BaseOrder> getLowerOrders() {
-        return BeanRelation.list(this, EBaseOrder.LowerOrders);
-    }
 }

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

@@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
-    @Column(name="TYPE")
+    @Column(name="IMPORT_TYPE")
     @ApiParam(value ="导入类型")
     @FieldAnnotation(defaultValue = "REPLACE")
-    private ApsEnumUtil.IMPORT_DETAIL_TYPE type;
+    private ApsEnumUtil.IMPORT_DETAIL_TYPE importType;
+
+    @Column(name="SKIP_ROWS")
+    @ApiParam(value ="跳过行数")
+    @FieldAnnotation(defaultValue = "0")
+    private Integer skipRows;
 
     @Column(name="ORDER_NUMBER")
     @ApiParam(value ="序号")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java

@@ -5,6 +5,4 @@ public enum EBaseOrder {
     Material,
     PrevRelations,
     PostRelations,
-    UpperOrders,
-    LowerOrders
 }