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

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatsResult.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;
@@ -15,5 +16,6 @@
    * 充电站统计信息
    */
   @NotNull
   private StationStatsInfo StationStats;
   @JsonProperty("StationStats")
   private StationStatsInfo stationStats;
}