Merge branch 'master' of github.com:/hs-web/hsweb-framework

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/src/main/java/org/hswebframework/web/entity/workflow/ActDefEntity.java

@@ -23,6 +23,11 @@ public interface ActDefEntity extends GenericEntity<String> {
      */
     String defId = "defId";
 
+    /**
+     * 关系类型
+     */
+    String type = "type";
+
     String getActId();
 
     void setActId(String actId);
@@ -34,4 +39,8 @@ public interface ActDefEntity extends GenericEntity<String> {
     String getDefId();
 
     void setDefId(String defId);
+
+    String getType();
+
+    void setType(String type);
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-entity/src/main/java/org/hswebframework/web/entity/workflow/SimpleActDefEntity.java

@@ -11,6 +11,7 @@ public class SimpleActDefEntity extends SimpleGenericEntity<String> implements A
     private String actId;
     private String formId;
     private String defId;
+    private String type;
 
     @Override
     public String getActId() {
@@ -41,4 +42,14 @@ public class SimpleActDefEntity extends SimpleGenericEntity<String> implements A
     public void setDefId(String defId) {
         this.defId = defId;
     }
+
+    @Override
+    public String getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(String type) {
+        this.type = type;
+    }
 }