Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-20 fa1a70790ff7fd4df4ab114f56bee9476128152e

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java

@@ -121,6 +121,10 @@
            /*数据列从1开始*/
            for (int i = 1; i <= rows; i++) {
                Row row = sheet.getRow(i);
                if (row.getCell(0) == null){
                    continue;
                }

                String materialCode = row.getCell(0).getStringCellValue();
                if (StringUtils.isEmpty(materialCode)){
                    continue;