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

zss

3 天以前 3effe2402062b93d9ea0ea3fed340156f2be937b

 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>