Merge remote-tracking branch 'origin/dev' into dev

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java

@@ -1,5 +1,6 @@
package com.ruoyi.integration.drainage.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
@@ -17,15 +18,18 @@
    * HHmmss
    */
   @NotNull
   private String StartTime;
   @JsonProperty("StartTime")
   private String startTime;
   /**
    * 时段电费
    */
   @NotNull
   private BigDecimal ElecPrice;
   @JsonProperty("ElecPrice")
   private BigDecimal elecPrice;
   /**
    * 时段服务费
    */
   @NotNull
   private BigDecimal SevicePrice;
   @JsonProperty("SevicePrice")
   private BigDecimal sevicePrice;
}