Merge branch 'dev_bugfix_ljj' into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridMemberStatisticsDailyServiceImpl.java

@@ -82,7 +82,7 @@ public class FactGridMemberStatisticsDailyServiceImpl extends BaseServiceImpl<Fa
 			return;
 		}
 		Map<String, StaffRoleInfoDTO> staffMap = staffInfoList.stream().collect(Collectors.toMap(StaffRoleInfoDTO :: getStaffId,
-				Function.identity()));
+				Function.identity(), (key1, key2) -> key2));
 		List<FactGridMemberStatisticsDailyEntity> list =  staffGridList.stream().filter(p -> null != staffMap.get(p.getStaffId())).map(item -> {
 			StaffRoleInfoDTO staffInfo = staffMap.get(item.getStaffId());
 			return initEntity(customerId, dateId, item, staffInfo);