Merge branch 'master' of http://118.89.139.230:10101/r/MonitStation

lxw

2023-12-23 4b2bd47090f86d80a8125d03de0167a4aaddc58e

Merge branch 'master' of http://118.89.139.230:10101/r/MonitStation

 src/main/java/com/whyc/service/CKPowerDevBreakerControlLogService.java

@@ -40,6 +40,7 @@
        if(param.getEndTime()!=null) {
            query.le("create_day", param.getEndTime());
        }
        query.orderByDesc("id");
        List<CKPowerDevBreakerControlLog> list = mapper.selectList(query);
        PageInfo<CKPowerDevBreakerControlLog> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo);

 src/main/java/com/whyc/service/CKPowerDevRtSetLogService.java

@@ -45,6 +45,7 @@
        if(param.getEndTime()!=null){
            query.le("create_day",param.getEndTime());
        }
        query.orderByDesc("id");
        List<CKPowerDevRtSetLog> list = mapper.selectList(query);
        PageInfo<CKPowerDevRtSetLog> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo);

 src/main/java/com/whyc/service/CKPowerDevSignalSetLogService.java

@@ -41,6 +41,7 @@
        if(param.getEndTime()!=null){
            query.le("create_day",param.getEndTime());
        }
        query.orderByDesc("id");
        List<CKPowerDevSignalSetLog> list = mapper.selectList(query);
        PageInfo<CKPowerDevSignalSetLog> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo);