Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-16 58a75277a83e48baa8ff9906e27975960659ff8a

 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<>();
}