Merge remote-tracking branch 'origin/master'

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java

@@ -472,7 +472,7 @@
            preDataViewSimpleDTO.setCurData(item.getCurData());
            preDataViewSimpleDTO.setRealData(item.getRealData());
            preDataViewSimpleDTO.setPreDataL(item.getPreDataL().stream()
                    .filter(data -> ((Date) data[0]).before(preDataBarLineRespVO.getPredictTime()))
                    .filter(data -> (DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)).before(preDataBarLineRespVO.getPredictTime()))
                    .collect(Collectors.toList()));
            preDataViewSimpleDTOList.add(preDataViewSimpleDTO);
        });

 ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java

@@ -20,7 +20,7 @@
                .likeIfPresent(PowerMaxdemandMainEntity::getName, reqVO.getName())
                .eqIfPresent(PowerMaxdemandMainEntity::getCode, reqVO.getCode())
                .geIfPresent(PowerMaxdemandMainEntity::getOccurTime, reqVO.getStartTime())
                .le(PowerMaxdemandMainEntity::getOccurTime, reqVO.getEndTime())
                .leIfPresent(PowerMaxdemandMainEntity::getOccurTime, reqVO.getEndTime())
                .orderByDesc(PowerMaxdemandMainEntity::getOccurTime));

    }