解决冲突

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java

@@ -69,4 +69,9 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "作业步骤名称")
     private String asName;
 
+    @Transient
+    @ApiParam(value = "流程名称")
+    private String agName;
+
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java

@@ -71,6 +71,9 @@ public class WmsActionResponseBean<Obj> {
     @ApiParam(value = "关键字段列名")
     public String keyColumn;
 
+    @ApiParam(value = "是否完成流程操作")
+    public Boolean isComplete = false;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;