Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 2c52eaf28f9b8a666547e1307a76c3032598e57f

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java

@@ -81,7 +81,6 @@
        poleXixunPlayer.setRequestBody(json);
        poleXixunPlayer.setScreenShot(programPro.getScreenShot());
        //  poleXixunPlayer.setCreatTime(sdf.format(date));
        poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
        if (SecurityUtils.getClientId() != null) {
            poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
            if (clientService.findClientId()) {