Merge branch 'release/v1.0.2-flow-update' of http://192.168.0.144/dcuc-tjdsj/approve-core into feature/v1.1.0-model3

 Conflicts:

	approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApprovalInfoDTO.java

approve-api/src/main/java/com/dragonsoft/dcuc/approve/model/req/ApprovalInfoDTO.java

@@ -119,6 +119,17 @@ public class ApprovalInfoDTO {
     @NotNull
     private ResourceInfoDTO resourceInfoDTO;
 
+    @ApiModelProperty(value = "申请类型")
+    private String flowType;
+
+    public String getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(String flowType) {
+        this.flowType = flowType;
+    }
+
     @ApiModelProperty(value = "下一任务对象信息")
     private List<ActivitiHolder> activitiHolderList;