订单合并功能开发完成。

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

@@ -43,6 +43,11 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Integer serialNumber = 0;
 
+    @Column(name="CONFIRM_SERIAL")
+    @ApiParam(value ="下发流水号")
+    @FieldAnnotation(property = false)
+    private Integer confirmSerial = 0;
+
     @Column(name="POST_SERIAL_NUMBER")
     @ApiParam(value ="子工作流水号")
     @FieldAnnotation(property = false)