Merge branch 'master' into electron_dev

zjk

2026-07-24 3ee306e4a8db75680960f5eb4eec9fb7d05b5f29

 ruoyi-system/src/main/resources/mapper/system/SysVisitorRecordMapper.xml

@@ -86,7 +86,7 @@
        from t_visitor_record
    </sql>

    <select id="pageList" resultMap="SysVisitorRecordVOResult">
    <sql id="selectVisitorRecordList">
        <include refid="selectVisitorRecordBase" />
        <where>
            and del_flag = '0'
@@ -124,13 +124,21 @@
                )
            </if>
            <if test="query.visitReason != null and query.visitReason != ''">
                and visit_reason = #{query.visitReason}
                and visit_reason like concat('%', #{query.visitReason}, '%')
            </if>
            <if test="query.registerType != null and query.registerType != ''">
                and register_type = #{query.registerType}
            </if>
        </where>
        order by register_time desc, record_id desc
    </sql>

    <select id="pageList" resultMap="SysVisitorRecordVOResult">
        <include refid="selectVisitorRecordList" />
    </select>

    <select id="list" resultMap="SysVisitorRecordVOResult">
        <include refid="selectVisitorRecordList" />
    </select>

    <select id="selectDetailById" parameterType="Long" resultMap="SysVisitorRecordDetailVOResult">