Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/ProcessHistoryEO.java

@@ -92,6 +92,6 @@ public class ProcessHistoryEO implements Serializable {
 
     /**用户账号，页面展示字段**/
 	@TableField(exist = false)
-	private String operatorPersonName;;
+	private String assignee;;
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java

@@ -146,7 +146,7 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 				}
 				if(StringUtils.isNotEmpty(data.getOperatorPersonId()) && CollectionUtils.isNotEmpty(sysUserList)){
 					SysUser userInfo = sysUserList.stream().filter(sysUser -> sysUser.getId().equals(data.getOperatorPersonId())).collect(Collectors.toList()).get(0);
-					data.setOperatorPersonId(userInfo.getUsername());
+					data.setAssignee(userInfo.getUsername());
 				}
 			}
 		}