From 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 09:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/dto/GetSiteListDTO.java | 14 ++++++++++++++
1 files changed, 14 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..5e1f33d 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
@@ -17,6 +17,8 @@
private String code;
@ApiModelProperty(value = "站点名称")
private String name;
+ @ApiModelProperty(value = "合作商id")
+ private Integer partnerId;
@ApiModelProperty(value = "合作商名称")
private String partnerName;
@ApiModelProperty(value = "站点类型（0=其他，1=公共，2=个人，3=公交（专业），4=环卫（专用），5=物流（专用），6=出租车（专用））")
@@ -39,4 +41,16 @@
private Integer chargingPileNumber;
@ApiModelProperty(value = "排序")
private Integer sort;
+ @ApiModelProperty("计费策略id")
+ private Integer accountingStrategyId;
+ @ApiModelProperty("计费策略类型（1=平台添加，2=自定义策略）")
+ private Integer accountingStrategyType;
+ @ApiModelProperty(value = "计费策略权限")
+ private boolean authAccountingStrategy = true;
+ @ApiModelProperty(value = "合作商权限")
+ private boolean authPartner = true;
+ @ApiModelProperty(value = "编辑权限")
+ private boolean authUpdate = true;
+ @ApiModelProperty(value = "删除权限")
+ private boolean authDelete = true;
}
--
Gitblit v1.7.1