Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java

@@ -526,6 +526,7 @@ public class ActTaskService extends BaseServiceImpl {
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         if (StringUtils.isNotEmpty(task.getAssignee())
                 && !task.getAssignee().equals(userId)) {
+            taskService.setVariable(taskId, "autoApply", taskId); // 配置不发送审核人分配通知
             taskService.setAssignee(taskId, userId); //与原任务审核人员不一致时，换成实际通过的人
         }
         if (StringUtils.isNotEmpty(comment)) {