Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-30 085620af2b61ee6200a95dae10cafb84f10b3be4

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileNotificationServiceImpl.java

@@ -83,7 +83,8 @@
            }
         }
      }else{
         siteIds = new HashSet<>(siteId);
         siteIds = new HashSet<>();
         siteIds.add(siteId);
      }
      PageInfo<TChargingPileNotification> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
      List<TChargingPileNotification> list = this.baseMapper.chargingPileNotificationPageList(pageInfo, siteIds);