Merge remote-tracking branch 'origin/master'

zss

2024-07-22 c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a

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

@@ -4,16 +4,16 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.LaboratoryMapper">


    <select id="selectItemParameter" resultType="com.yuanchu.mom.pojo.Laboratory">
        select * from
        (
        select l.id,
        laboratory_name,
        laboratory_number,
        laboratory_code,
        phone_number,
        head,
        address,
        l.address,
        u1.name create_user_name,
        l.create_time
        from laboratory l
@@ -32,7 +32,7 @@
                       laboratory_number,
                       phone_number,
                       head,
                       address,
                       l.address,
                       u1.name create_user_name,
                       l.create_time
                from laboratory l