Merge remote-tracking branch 'origin/master'

linwei

2024-01-17 f5539e2f8e35d7e53abf54409245c5c7f9d2a72a

 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml

@@ -37,6 +37,9 @@
        <if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
            and jh.name like concat('%',#{gridWorkLog.name},'%')
        </if>
        <if test="gridWorkLog.houseCode !=null and gridWorkLog.houseCode!=''">
            and jh.house_code = #{gridWorkLog.houseCode}
        </if>
        <if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
            and jh.phone_number like concat('%',#{gridWorkLog.phone},'%')
        </if>