Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-24 e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293

 inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml

@@ -17,7 +17,7 @@
            AND d.`sample_name` like concat('%', #{sampleName}, '%')
        </if>
        <if test="entrusted != null and entrusted != null">
            AND l.`contacts` like concat('%', #{entrusted}, '%')
            AND l.`entrusted` like concat('%', #{entrusted}, '%')
        </if>
        <if test="inspectionStatus != null and inspectionStatus != null">
            AND d.`inspection_status` = #{inspectionStatus}