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

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

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

}