From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java | 4 +++-
1 files changed, 3 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 6086e2f..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,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<>();
}
--
Gitblit v1.9.3