Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-18 ad95de03f14c19d548f06a79f2496f15c957b6c5

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

@@ -83,6 +83,12 @@
        String json = JSON.toJSONString(taskSchedules, SerializerFeature.WriteMapNullValue);
//         String json = new Gson().toJson(taskSchedules);
        ledScheduleEntity.setSchedule(json);
        if (SecurityUtils.getClientId() != null) {
            ledScheduleEntity.setUserId(SecurityUtils.getUserId());
            if (clientService.findClientId()) {
                ledScheduleEntity.setClientId(clientService.getClientId());
            }
        }
        return this.save(ledScheduleEntity);
    }