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

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

@@ -12,7 +12,8 @@
 */
@Data
public class SupStationInfoResult {
    private SupStationInfo SupStationInfo;
    @JsonProperty("SupStationInfo")
    private StationInfo SupStationInfo;