Merge remote-tracking branch 'origin/master'

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

@@ -535,7 +535,7 @@
        preDataBarLineRespVO.getDataViewList().forEach(item -> {
            PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
            preDataViewSimpleDTO.setItemName(item.getResultName());
            preDataViewSimpleDTO.setPredictTime(item.getPredictTime());
            preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());

            preDataViewSimpleDTO.setCurData(item.getCurData());
            preDataViewSimpleDTO.setRealData(item.getRealData());

 ansteel-biz/src/main/java/com/iailab/module/ansteel/gas/service/impl/GasPredConfServiceImpl.java

@@ -57,7 +57,7 @@
                PreDataViewRespDTO result = resultMap.get(config.getOutId());
                PreDataViewSimpleDTO preDataViewSimpleDTO = new PreDataViewSimpleDTO();
                preDataViewSimpleDTO.setItemName(config.getOutName());
                preDataViewSimpleDTO.setPredictTime(result.getPredictTime());
                preDataViewSimpleDTO.setPredictTime(preDataBarLineRespVO.getPredictTime());
                preDataViewSimpleDTO.setLineType(config.getLineType());

                preDataViewSimpleDTO.setCurData(result.getCurData());

 doc/鞍钢数据接口文档_master.doc

Binary files differ