Merge remote-tracking branch 'origin/master'

zss

2024-06-28 c3e4a95cc4ada32b0ac7f14fcd5469bd1bbd1c09

 performance-server/src/main/resources/mapper/AuxiliaryOriginalHoursMapper.xml

@@ -27,7 +27,7 @@
        order by month
        ) A
        group by A.name, A.month) C
        LEFT JOIN
        INNER JOIN
        (select B.name,
        B.month,
        B.manHours