Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2024-09-28 ceb8e9adae1835a3f8595e71eeb18b5e8f5dd5b9

 ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java

@@ -5,9 +5,6 @@
import com.ycl.entity.user.UmsAdmin;
import com.ycl.mapper.unlawful.UnlawfulMapper;
import com.ycl.service.oss.OssService;
import com.ycl.util.dahua.alarm.AlarmDataCB;
import com.ycl.util.dahua.lib.module.LoginModule;
import com.ycl.util.dahua.module.AlarmListenModule;
import net.coobird.thumbnailator.Thumbnails;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;