Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

 standard-server/src/main/resources/mapper/ProductModelMapper.xml

@@ -47,6 +47,13 @@
               unit
        from lims_laboratory.product_model
        where state = 1
          and material =#{name}
          and material = #{name}
    </select>

    <!--添加标准选择样品名称-->
    <select id="selectmater" resultType="java.lang.String">
        select material
        from lims_laboratory.product_model
        where state = 1
    </select>
</mapper>