Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-17 c428cfbdb79fdbb6b61ff10db62426d567e664a8

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

@@ -49,8 +49,9 @@
        select ach.*,name
        FROM auxiliary_correction_hours ach
        left join user on user.id=ach.name_user
        WHERE 1=1
        <if test="ids !=null and ids != ''">
            WHERE name_user in
            and name_user in
            <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
                #{val}
            </foreach>