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

cjl

2023-07-27 44251a92dc85a93eff59704b40b07830bde8d16f

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

@@ -19,6 +19,8 @@

    List<Map<String,Object>> selectDataByCondition(Map<String, Object> map);

    List<Map<String,Object>> selectDataByConditionWithoutPage(Map<String, Object> map);

    List<Map<String,Object>> selectNewestData(Map<String, Object> map);

}