Merge remote-tracking branch 'origin/master'

value

2024-05-09 7e51076a4cccc27df31bcdd98ca14c2f9d4928e9

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

@@ -160,6 +160,10 @@
        and state = 1
        and ip.son_laboratory = #{laboratory}
    </select>
    <select id="getSampleEn" resultType="java.lang.String">
        select name_en from `center-lims`.product
        where name = #{sample}
    </select>

    <resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
        <id property="id" column="id" jdbcType="INTEGER"/>