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

cjl

2023-12-25 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e

 screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/HeatMapDTO.java

@@ -43,14 +43,19 @@

    private  String name;

    public Double getCount(){
        Double count = this.count;
        if (ObjectUtils.isEmpty(count)){
            count= 0.0;
            return count;
        }
        return count;
    }
    private  Integer groupId;


//    private  Double  sum;

//    public Double getCount(){
//        Double count = this.count;
//        if (ObjectUtils.isEmpty(count)){
//            count= 0.0;
//            return count;
//        }
//        return count;
//    }


}