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

huliguo

5 小时以前 cbad982befcf58521b224da1e8898c23c5e0d2c6

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

@@ -23,7 +23,6 @@
    @JsonProperty("EquipRealTimePower")

    private BigDecimal EquipRealTimePower;
    @JsonProperty("DataTime")

    @JsonProperty("ConnectorPowerInfos")
    private List<SupConnectorPowerInfo> ConnectorPowerInfos;
}