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

liding

2026-03-16 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9

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

@@ -28,10 +28,10 @@
            AND rm.check_type = #{params.checkType}
        </if>
        <if test="params.entryDateStart != null and params.entryDateStart != '' ">
            AND rm.check_time &gt;= DATE_FORMAT(#{params.entryDateStart},'%Y-%m-%d')
            AND rm.check_time &gt;= #{params.entryDateStart}
        </if>
        <if test="params.entryDateEnd != null and params.entryDateEnd != '' ">
            AND rm.check_time &lt;= DATE_FORMAT(#{params.entryDateEnd},'%Y-%m-%d')
            AND rm.check_time &lt;= #{params.entryDateEnd}
        </if>
        ORDER BY rm.check_time DESC
    </select>