Merge remote-tracking branch 'origin/master'

zss

2024-07-26 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57

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

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
    <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
        select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as type,s.create_time
        select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time
        from seal s  LEFT JOIN laboratory l  on s.lab_id=l.id
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}