Merge remote-tracking branch 'origin/master'

guoshilong

2024-01-18 1f869d1e5c9361645e7be28d2c27407d838a7d22

 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>