Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

Fang

2022-03-07 bea63f67e75ea6c38d946c2ee463260fcf815f87

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

@@ -158,6 +158,7 @@
    public WVPResult<String> deleteMediaServer(@RequestParam  String id){
        if (mediaServerService.getOne(id) != null) {
            mediaServerService.delete(id);
            mediaServerService.deleteDb(id);
        }else {
            WVPResult<String> result = new WVPResult<>();
            result.setCode(-1);