Merge branch 'dev_New' into pcdz

zss

2026-02-06 41d35c56043108b66a14e7a2d2d13bedfc2508e0

 src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml

@@ -15,7 +15,7 @@
        next_date,
        record_date,
        CASE
        WHEN next_date >=  DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
        WHEN most_date >=  DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
        ELSE 2
        END AS status,
        create_user,
@@ -56,4 +56,4 @@
        </where>
        ORDER BY update_time DESC
    </select>
</mapper>
</mapper>