Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java

@@ -6,6 +6,7 @@
import com.ruoyi.performance.dto.PerformanceShiftAddDto;
import com.ruoyi.performance.pojo.PerformanceShift;

import java.util.List;
import java.util.Map;

/**
@@ -29,4 +30,7 @@
    Map<Object, Object> exportToYearExcel(String time, String userName, String laboratory) throws Exception;

    Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory);

    Map<String, List<Map<String,Object>>> getUserList();

}