分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 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,