Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev

renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java

@@ -219,6 +219,7 @@ public class HistoryController {
                 detailDTO.setExecutionId(task.getExecutionId());
                 detailDTO.setProcessDefinitionId(task.getProcessDefinitionId());
                 detailDTO.setComment("待审核");
+                detailDTO.setTaskId(task.getId());
                 final List<HistoryDetailDTO> taskHandleDetailInfo_ = new ArrayList<>();
                 taskHandleDetailInfo_.add(detailDTO);
                 taskHandleDetailInfo_.addAll(list);