Merge remote-tracking branch 'origin/master'

zhongrj

2024-01-31 a5c2a3b99f46866a666618bc461340aa4e679b1c

 src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.xml

@@ -43,7 +43,6 @@
            </if>
        </where>
        order by jcir.create_time desc

    </select>

    <resultMap type="org.springblade.modules.checkInRecords.dto.CheckInRecordsDTO" id="CheckInRecordsDTOResult">
@@ -96,6 +95,4 @@
            <if test="deletedFlag != null "> and deleted_flag = #{deletedFlag}</if>
        </where>
    </select>


</mapper>