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

cjl

2023-07-10 315ec391b2a36a6d796a8726b57b7c2b8908db12

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

@@ -19,4 +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);

}