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

zhuo

2025-04-21 09c297c75f036f017dedfb163e338c6c427477d5

 cnas-device/src/main/resources/mapper/InsOrderDeviceRecordMapper.xml

@@ -44,7 +44,8 @@
            and dr.device_id = #{deviceId}
        </if>
        <if test="exportDate != '' and exportDate != null">
            and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate};
            and DATE_FORMAT(dr.use_start_date, '%Y-%m') = #{exportDate}
        </if>
        ORDER BY dr.use_start_date asc
    </select>
</mapper>