Merge remote-tracking branch 'origin/develop' into FOTON

This commit is contained in:
zhangjun
2022-09-26 17:45:33 +08:00
@@ -135,7 +135,7 @@ public class TaskController {
String str = "";
if(list1.size()>0){
ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId());
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 委托)");
historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
}
}
}