From 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 19:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java b/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java
index 9b82bb4..359a16e 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java
+++ b/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<>();
}
--
Gitblit v1.9.3