Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-12 11af23e0c7976eed1211ba2ca0beae3a12e19310

 basic-server/src/main/resources/mapper/LaboratoryMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.LaboratoryMapper">

    <select id="selectItemParameter" resultType="com.ruoyi.inspect.pojo.Laboratory">
    <select id="selectItemParameter" resultType="com.ruoyi.basic.pojo.Laboratory">
        select * from
        (
        select l.id,