Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-09 6b79e22056bcc2c14d3e20802174b89bc2a0a204

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

@@ -6,6 +6,9 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO;
import com.ruoyi.chargingPile.mapper.SiteMapper;
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.chargingPile.service.TChargingGunService;
@@ -151,6 +154,14 @@
      this.updateById(site);
      return AjaxResult.success();
   }

   @Override
   public PageInfo<SiteVO> pageList(SiteQuery query) {
      PageInfo<SiteVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
      List<SiteVO> list = this.baseMapper.pageList(query,pageInfo);
      pageInfo.setRecords(list);
      return pageInfo;
   }
   
   
   /**