Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

yuan

6 天以前 84b131de4a1deb526066fc0f7e7514ac43838bf8

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -43,7 +43,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY qi.check_time DESC
        ORDER BY coalesce(qi.check_time, qi.create_time) DESC
    </select>

    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">