Merge remote-tracking branch 'origin/master'

zss

2024-08-12 2c00320ecf5745742b9dc9a960f506165e880727

 performance-server/src/main/java/com/yuanchu/mom/mapper/AuxiliaryOutputWorkingHoursMapper.java

@@ -30,7 +30,7 @@
    List<AuxiliaryOutputWorkingHoursDto> selectDataByUser(@Param("ids") List<Integer> ids);

    //查询该月的产量工时
    List<Map<String, Object>> totalHours(@Param("month") String month, @Param("ids") List<Integer> ids);
    List<Map<String, Object>> totalHours(@Param("month") String month, @Param("ids") List<Integer> ids, @Param("type") String type);


    List<AuxiliaryOutputWorkingHours> selectListByIds(@Param("ids") List<Integer> ids);