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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

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

@@ -42,4 +42,7 @@

    List<HeatMapDTO> getHeatMap(HashMap<String,Object> params);


    List<HeatMapDTO> getHeatMapV1(HashMap<String,Object> params);

}