Merge remote-tracking branch 'origin/master'

于杰

2025-07-28 6fac4cbed12a84473e8eab217abacc221dedca9f

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -803,7 +803,8 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        group by fol.remarks,od.order_id,fol.process_id
        group by fol.remarks,od.order_id
        -- ,fol.process_id
        order by fol.operate_time desc
        limit #{offset},#{pageSize};
    </select>