Merge remote-tracking branch 'origin/master'

zss

2023-08-22 da30df12fc02f28a4b016c8c35a3b57e5c29fe35

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

@@ -23,15 +23,5 @@
        select * from lims_laboratory.raw_material where state=1
    </select>

    <select id="selectRawmaById" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionVo">
        select create_time formTime,
               supplier_name supplier,
               material_coding mcode,
               material_name name,
               specifications_models specifications,
               unit ,
               quantity num
        from lims_laboratory.raw_material
        where id=#{id}
    </select>

</mapper>