Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-22 f77a2eba10ce3f430d31a34790a8a1184c8069e6

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

@@ -66,11 +66,4 @@
        WHERE m.`state` = 1
    </select>


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