Merge remote-tracking branch 'origin/master' into master

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

 src/main/java/com/nanometer/smartlab/service/SysWarningServiceImpl.java

@@ -76,7 +76,6 @@

    @Override
    public void updateSysWarning(SysWarning selectedWarning) throws IOException {

        try {
            Map<String,Object> params = new HashMap<>();
            params.put("memo", selectedWarning.getMemo());
@@ -103,7 +102,6 @@
                logger.info("关联daping的告警id为空 ");
            }
                this.sysWarningDao.updateSysWarning(params);

        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
            throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);