Merge remote-tracking branch 'origin/master'

zss

2024-06-18 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3

 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