Merge remote-tracking branch 'origin/develop_master' into develop_1

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java

@@ -11,6 +11,7 @@ import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
+import java.time.LocalDate;
 import java.util.Date;
 
 @Data

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java

@@ -172,9 +172,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         return "更改成功";
     }
     private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) {
-        DataDTO dataDTO = new DataDTO();
-        wrapper.eq("power",1)
-                .between("PUT_TIME",dataDTO.getStartDate(),dataDTO.getEndDate());
+        wrapper.eq("power",1);
         Page<EarlyWarningEO> page = new Page<>(current, pageSize);
         IPage<EarlyWarningEO> userIPage = earlyWarningEODao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());