Merge branch 'dev' into dev-g

jsowell-pile/src/main/java/com/jsowell/pile/domain/ChargeAlgorithmRecord.java

@@ -143,6 +143,12 @@ public class ChargeAlgorithmRecord extends BaseEntity {
     @Excel(name = "故障体系指标")
     private String failureMetrics;
 
+    /**
+     * 性能体系指标
+     */
+    @Excel(name = "性能体系指标")
+    private String performanceMetrics;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
@@ -167,6 +173,7 @@ public class ChargeAlgorithmRecord extends BaseEntity {
                 .append("maxAllowableElectricityAlarm", getMaxAllowableElectricityAlarm())
                 .append("securitySystemLevel", getSecuritySystemLevel())
                 .append("failureMetrics", getFailureMetrics())
+                .append("performanceMetrics", getPerformanceMetrics())
                 .append("createTime", getCreateTime())
                 .toString();
     }