From 2f226b5b2d80be1eba34d3c641b7cc08be0c322c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 10:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetSiteListDTO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetSiteListDTO.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetSiteListDTO.java
index 641f0ff..7fb9ab5 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetSiteListDTO.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetSiteListDTO.java
@@ -39,4 +39,8 @@
 	private Integer chargingPileNumber;
 	@ApiModelProperty(value = "排序")
 	private Integer sort;
+	@ApiModelProperty("计费策略id")
+	private Integer accountingStrategyId;
+	@ApiModelProperty("计费策略类型(1=平台添加,2=自定义策略)")
+	private Integer accountingStrategyType;
 }

--
Gitblit v1.7.1