Merge remote-tracking branch 'origin/master'

吴羡

5 小时以前 cdd9ef5944a1cda82d98f1544fb451c7dd4f8c3d

 cnas-process/src/main/resources/mapper/ProcessReportMapper.xml

@@ -47,6 +47,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        order by A.send_time desc, A.id desc
    </select>
    <select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
        select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,