Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-09 827cda96e65856b3b83c2a9b0fe418bd7ec48e94

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -211,7 +211,7 @@
        ) isu2 on
        isu2.ins_sample_id = a.id
        where ins_state is not null
        <if test="laboratory != null and laboratory!=''">
        <if test="laboratory != null and laboratory != ''">
            and laboratory=#{laboratory}
        </if>
        ORDER BY