Merge remote-tracking branch 'origin/master'

zss

2024-07-04 8f1cc22902458459caaa41cde90952e25f869a8d

 performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java

@@ -16,10 +16,12 @@

    private String userId;

    private String department;

    private Map<String, Object> monthlyAttendance = new HashMap<>();

    private Map<String, Object> sidebarAnnualAttendance = new HashMap<>();;
    private List<?> list = new ArrayList<>();
    private List<Map<String, Object>> list = new ArrayList<>();

    private List<Map<Object, Object>> headerList = new ArrayList<>();
}