Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-24 bef458cd14d2e0f2b09d76b609291f47be3cd525

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

@@ -30,7 +30,7 @@
                AND (
                t3.id LIKE CONCAT('%', #{keyword},'%')
                OR t3.pole_name LIKE CONCAT('%', #{keyword},'%')
                OR t1.error_code LIKE CONCAT('%', #{keyword},'%')
                OR t1.device_code LIKE CONCAT('%', #{keyword},'%')
                )
            </if>
            <if test="userid != null">