Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-job/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java

@@ -2,6 +2,9 @@

import com.moral.api.entity.AlarmInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.Map;

/**
 * <p>
@@ -15,4 +18,6 @@

    void createTable(String timeUnits);

    void insertAlarmInfo(@Param("timeUnits") String timeUnits, @Param("map")Map<String,Object> map);

}