Merge remote-tracking branch 'origin/master'

zouyu

2024-08-07 54f19e72cfac8a1f44d2c52b30cfe92eff12ce2f

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