Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

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

@@ -6,8 +6,9 @@
        select id, name
        from lims_laboratory.material
        where state = 1
        and type = #{type}
        order by create_time desc
        limit #{num1},#{num2}
            limit #{num1},#{num2}
    </select>
    <select id="selectMaterialById" resultType="Map">
        select m.id,