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

skyouc

2025-04-09 7cf530b0b63c8a06777f3915b08d742e46e2a5fc

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java

@@ -20,12 +20,12 @@
    private List<Long> typeIds;

    @ApiModelProperty("作业站点")
    private List<String> sites;
    private String sites;

    @ApiModelProperty("设备编号")
    private String deviceCode;

    @ApiModelProperty("设备作业站点")
    private List<String> deviceSites;
    private String deviceSites;

}