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

gongchunyi

2 天以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 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>