Merge branch 'wvp-28181-2.0' into wvp-pro-record

648540858

2022-03-03 14174ff40022a1f7662759d478d06b7b350ccd98

 src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java

@@ -58,8 +58,6 @@
    @GetMapping(value = "/media_server/list")
    @ResponseBody
    public WVPResult<List<MediaServerItem>> getMediaServerList(boolean detail){
        List<MediaServerItem> all = mediaServerService.getAll();

        WVPResult<List<MediaServerItem>> result = new WVPResult<>();
        result.setCode(0);
        result.setMsg("success");