Merge remote-tracking branch 'origin/master'

sgj

2 天以前 18127822f3cdb4778fb62ba0304bb8372dada516

 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java

@@ -91,7 +91,7 @@

        // 调整数据
        int maxZ = 3;
        int hour = 0;
        //int hour = 0;
        List<GrainDataReport> dataList = new ArrayList<>();
        GrainDataReport report;
        DepotConf depotConf;