Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-09-07 407a5b77c3586fef44dc771e48f05c2354740795

 src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java

@@ -14,6 +14,8 @@

    List<MediaServerItem> getAll();

    List<MediaServerItem> getAllFromDatabase();

    List<MediaServerItem> getAllOnline();

    MediaServerItem getOne(String generalMediaServerId);