From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/chargeRuleFee/ChargeRuleFeeDto.java |   62 +++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/chargeRuleFee/ChargeRuleFeeDto.java b/java110-bean/src/main/java/com/java110/dto/chargeRuleFee/ChargeRuleFeeDto.java
index 6ec8e3b..f5c6f61 100644
--- a/java110-bean/src/main/java/com/java110/dto/chargeRuleFee/ChargeRuleFeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/chargeRuleFee/ChargeRuleFeeDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.chargeRuleFee;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,14 @@
 public class ChargeRuleFeeDto extends PageDto implements Serializable {
 
     private String maxEnergyPrice;
-private String durationPrice;
-private String crfId;
-private String remark;
-private String ruleId;
-private String minEnergyPrice;
-private String communityId;
+    private String durationPrice;
+    private String crfId;
+    private String remark;
+    private String ruleId;
+    private String minEnergyPrice;
+    private String communityId;
+
+    private String energy;
 
 
     private Date createTime;
@@ -31,43 +34,56 @@
     public String getMaxEnergyPrice() {
         return maxEnergyPrice;
     }
-public void setMaxEnergyPrice(String maxEnergyPrice) {
+
+    public void setMaxEnergyPrice(String maxEnergyPrice) {
         this.maxEnergyPrice = maxEnergyPrice;
     }
-public String getDurationPrice() {
+
+    public String getDurationPrice() {
         return durationPrice;
     }
-public void setDurationPrice(String durationPrice) {
+
+    public void setDurationPrice(String durationPrice) {
         this.durationPrice = durationPrice;
     }
-public String getCrfId() {
+
+    public String getCrfId() {
         return crfId;
     }
-public void setCrfId(String crfId) {
+
+    public void setCrfId(String crfId) {
         this.crfId = crfId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getMinEnergyPrice() {
+
+    public String getMinEnergyPrice() {
         return minEnergyPrice;
     }
-public void setMinEnergyPrice(String minEnergyPrice) {
+
+    public void setMinEnergyPrice(String minEnergyPrice) {
         this.minEnergyPrice = minEnergyPrice;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -87,4 +103,12 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getEnergy() {
+        return energy;
+    }
+
+    public void setEnergy(String energy) {
+        this.energy = energy;
+    }
 }

--
Gitblit v1.8.0