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

cjl

2023-07-24 3ce298bd6f26c0807074dc50c73abf0c3abeaf53

 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);

}