Merge branch 'master' into pjfk

# Conflicts:
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java
#	pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java

@@ -61,6 +61,15 @@ public interface RemoteFlowApiFlowService {
     @PostMapping("/process-instance/queryMineTask")
     R<Page<TaskDto>> queryMineTask(@RequestBody TaskQueryParamDto queryParamDto);
 
+    /**
+     * 查询当前用户的已任务
+     *
+     * @param queryParamDto
+     * @return {@link R } 流程实例ID {@link String}
+     */
+    @PostMapping("/process-instance/queryMineEndTask")
+    R<Page<TaskDto>> queryMineEndTask(@RequestBody TaskQueryParamDto queryParamDto);
+
     /**
      * 获取流程数据
      * @param businessKey 业务key