合并代码

zhibing.pu

2024-08-09 c1b575294514b979cee1fe50240e8cee3b8efb2b

合并代码

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java

@@ -59,9 +59,6 @@
                .eq(TChargingPile::getSiteId,siteId)));
    }

	
    @Resource
    private TChargingPileService chargingPileService;
    
    
    @ResponseBody

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java

@@ -4,6 +4,8 @@
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.query.GetSiteList;
import com.ruoyi.chargingPile.api.query.SiteQuery;
import com.ruoyi.chargingPile.api.vo.SiteVO;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import org.springframework.web.bind.annotation.PathVariable;
@@ -55,4 +57,7 @@
     * @param accountingStrategyId 计费策略id
     */
    void setAccountingStrategy(Integer id, Integer accountingStrategyId);
	
	
    PageInfo<SiteVO> pageList(SiteQuery query);
}