Merge remote-tracking branch 'origin/master'

zss

2024-06-18 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3

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

@@ -267,7 +267,7 @@
        select id from structure_item_parameter
        where sample like concat('%', #{sampleType}, '%')
        and inspection_item = #{item}
        <if test="itemChild != null">
        <if test="itemChild != null and itemChild != ''">
            and inspection_item_subclass = #{itemChild}
        </if>
    </select>