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

zhanghl

2025-05-16 c3c7756721b8b29585615f6d2c6cb6166f17c7cc

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

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

@@ -592,7 +592,7 @@
                            }
                            List<ApsResourceDateStat> tempList = new ArrayList<>(dayMap.values());
                            HashMap<String, List<ApsResourceDateStat>> temp = new HashMap<>();
                            temp.put(processName + "-" + plant, tempList);
                            temp.put(processName + "_" + plant, tempList);
                            processList.add(temp);
                        }
                    } else {