Merge remote-tracking branch 'origin/master'

648540858

2024-04-30 edfd528dd585c2279b9575ddfceb2af36fc0c240

 src/main/java/com/genersoft/iot/vmp/conf/CloudRecordTimer.java

@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.conf;


import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;