Merge remote-tracking branch 'origin/master'

zss

2024-08-05 9183a9a18a910d5b099119240a86a3a87ce42106

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

@@ -16,8 +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<>();
}