Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-13 d65594e37be2179b60cdc1730819ff156b39639c

 dao/src/main/resources/mapper/WaterQualityEquipmentMapper.xml

@@ -41,7 +41,7 @@
                AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%')
            </if>
            <if test="clientId != null">
                AND t3.client_id = #{clientId}
                AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId})
            </if>
        </where>
    </select>