Merge branch 'test' into ext-dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java

@@ -93,6 +93,10 @@ public class StepResult<T> {
         return new StepResult<>(true, data, "");
     }
 
+    public static <T> StepResult<T> getNewSuccessData(T data, String nextTriggerEvent) {
+        return new StepResult<>(true, data, "", nextTriggerEvent);
+    }
+
     public static <T> StepResult<T> getSuccessData(Collection<T> data, String msg) {
         return new StepResult<T>(true, data, msg);
     }
@@ -126,6 +130,13 @@ public class StepResult<T> {
         this.msg = msg;
     }
 
+    public StepResult(boolean isCompleted, T data, String msg, String nextTriggerEvent) {
+        this.isCompleted = isCompleted;
+        this.data = data;
+        this.msg = msg;
+        this.nextTriggerEvent = nextTriggerEvent;
+    }
+
     public StepResult(boolean isCompleted, Collection<T> dataCollection, String msg) {
         this.isCompleted = isCompleted;
         this.dataCollection = dataCollection;