Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

7 天以前 ded338d0bafa5594b275edb81a8f69ea4446c37c

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

@@ -25,6 +25,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND  check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY check_time DESC
    </select>
    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
        SELECT