Merge remote-tracking branch 'origin/master'

lin

2024-04-12 b9f32ef5413a1b267f86f79db169386aff61c9e7

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

@@ -29,6 +29,9 @@
        <if test="gridPatrolRecord.context!=null and gridPatrolRecord.context!=''">
            and jgpr.context like concat('%',#{gridPatrolRecord.context},'%')
        </if>
        <if test="gridPatrolRecord.createUser!=null">
            and jgpr.create_user = #{gridPatrolRecord.createUser}
        </if>
    </select>