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

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

@@ -24,4 +24,8 @@
    */
   @JsonProperty("ConnectorStatusInfos")
   private List<ConnectorStatusInfo> connectorStatusInfos;
   @JsonProperty("OperatorID")
   private String OperatorID;
   @JsonProperty("EquipmentOwnerID")
   private String EquipmentOwnerID;
}